diff --git a/packages/cli/src/ui/hooks/useShellCompletion.ts b/packages/cli/src/ui/hooks/useShellCompletion.ts
index 23f04aee4a..41ae17105b 100644
--- a/packages/cli/src/ui/hooks/useShellCompletion.ts
+++ b/packages/cli/src/ui/hooks/useShellCompletion.ts
@@ -497,13 +497,16 @@ export function useShellCompletion({
     setIsLoadingSuggestions,
   ]);
 
-  // Debounced effect to trigger completion
   useEffect(() => {
     if (!enabled) {
       setSuggestions([]);
       setIsLoadingSuggestions(false);
-      return;
     }
+  }, [enabled, setSuggestions, setIsLoadingSuggestions]);
+
+  // Debounced effect to trigger completion
+  useEffect(() => {
+    if (!enabled) return;
 
     if (debounceRef.current) {
       clearTimeout(debounceRef.current);
@@ -519,7 +522,7 @@ export function useShellCompletion({
         clearTimeout(debounceRef.current);
       }
     };
-  }, [enabled, performCompletion, setSuggestions, setIsLoadingSuggestions]);
+  }, [enabled, performCompletion]);
 
   // Cleanup on unmount
   useEffect(