diff --git a/packages/cli/src/ui/hooks/useGeminiStream.ts b/packages/cli/src/ui/hooks/useGeminiStream.ts
index 92b055bb..3ca4b03a 100644
--- a/packages/cli/src/ui/hooks/useGeminiStream.ts
+++ b/packages/cli/src/ui/hooks/useGeminiStream.ts
@@ -600,9 +600,7 @@ export const useGeminiStream = (
           );
         }
       } finally {
-        if (streamingState !== StreamingState.WaitingForConfirmation) {
-          abortControllerRef.current = null;
-        }
+        abortControllerRef.current = null; // Always reset
         setIsResponding(false);
       }
     },