diff --git a/webui/src/web-components/sketch-app-shell.ts b/webui/src/web-components/sketch-app-shell.ts
index a4dfeee..b356535 100644
--- a/webui/src/web-components/sketch-app-shell.ts
+++ b/webui/src/web-components/sketch-app-shell.ts
@@ -566,6 +566,13 @@
 
     // Update state if we received it
     if (state) {
+      // Ensure we're using the latest call status to prevent indicators from being stuck
+      if (state.outstanding_llm_calls === 0 && state.outstanding_tool_calls.length === 0) {
+        // Force reset containerState calls when nothing is reported as in progress
+        state.outstanding_llm_calls = 0;
+        state.outstanding_tool_calls = [];
+      }
+      
       this.containerState = state;
       this.title = state.title;