diff --git a/jina-ai/src/patch-express.ts b/jina-ai/src/patch-express.ts
index 2a8814c..3808e14 100644
--- a/jina-ai/src/patch-express.ts
+++ b/jina-ai/src/patch-express.ts
@@ -192,6 +192,8 @@ export const jinaAiMiddleware = (req: Request, res: Response, next: NextFunction
                     }
                 ).catch((err: any) => {
                     logger.warn(`Failed to save promptContext`, { err: marshalErrorLike(err) });
+                }).finally(() => {
+                    ctx.promptContext = undefined;
                 });
             }
 
@@ -211,10 +213,6 @@ export const jinaAiMiddleware = (req: Request, res: Response, next: NextFunction
             if (err.stack) {
                 logger.error(err.stack);
             }
-        } finally {
-            if (ctx.promptContext) {
-                ctx.promptContext = null;
-            }
         }
 
     });
diff --git a/src/agent.ts b/src/agent.ts
index de7ba70..f56456f 100644
--- a/src/agent.ts
+++ b/src/agent.ts
@@ -239,12 +239,6 @@ ${actionSections.join('\n\n')}
 }
 
 
-const allContext: StepAction[] = [];  // all steps in the current session, including those leads to wrong results
-
-function updateContext(step: any) {
-  allContext.push(step)
-}
-
 async function updateReferences(thisStep: AnswerAction, allURLs: Record<string, SearchSnippet>) {
   thisStep.references = thisStep.references
     ?.filter(ref => ref?.url)
@@ -399,6 +393,11 @@ export async function getResponse(question?: string,
 
   let step = 0;
   let totalStep = 0;
+  const allContext: StepAction[] = [];  // all steps in the current session, including those leads to wrong results
+
+  const updateContext = function(step: any) {
+    allContext.push(step);
+  }
 
   question = question?.trim() as string;
   // remove incoming system messages to avoid override