diff --git a/packages/core/src/codewhispererChat/controllers/chat/controller.ts b/packages/core/src/codewhispererChat/controllers/chat/controller.ts
index e6c536c65df..25d6d4b841d 100644
--- a/packages/core/src/codewhispererChat/controllers/chat/controller.ts
+++ b/packages/core/src/codewhispererChat/controllers/chat/controller.ts
@@ -774,7 +774,7 @@ export class ChatController {
                         toolResults: toolResults,
                         profile: AuthUtil.instance.regionProfileManager.activeRegionProfile,
                         origin: Origin.IDE,
-                        context: [],
+                        context: session.context ?? [],
                         relevantTextDocuments: [],
                         additionalContents: [],
                         documentReferences: [],
diff --git a/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts b/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts
index d71140b8da3..a61687d2414 100644
--- a/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts
+++ b/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts
@@ -257,11 +257,7 @@ export class Messenger {
                     }
 
                     const cwChatEvent: cwChatResponseStream = chatEvent
-                    if (
-                        cwChatEvent.toolUseEvent?.input !== undefined &&
-                        cwChatEvent.toolUseEvent.input.length > 0 &&
-                        !cwChatEvent.toolUseEvent.stop
-                    ) {
+                    if (cwChatEvent.toolUseEvent?.input !== undefined && cwChatEvent.toolUseEvent.input.length > 0) {
                         toolUseInput += cwChatEvent.toolUseEvent.input
                     }