diff --git a/frontend/app/components/assistant-ui/thread.tsx b/frontend/app/components/assistant-ui/thread.tsx
index 7c3b8dc..16d8717 100644
--- a/frontend/app/components/assistant-ui/thread.tsx
+++ b/frontend/app/components/assistant-ui/thread.tsx
@@ -1188,8 +1188,14 @@ function useComposerContextStatus() {
 						sessionPayload =
 							(await sessionResponse.json()) as ClawStoredSession;
 					} else if (sessionResponse.status === 404) {
-						clearActiveSessionId();
-						sessionId = null;
+						if (
+							sessionId === normalizeSessionId(readPendingWorkspaceSessionId())
+						) {
+							sessionPayload = null;
+						} else {
+							clearActiveSessionId();
+							sessionId = null;
+						}
 					}
 				}
 				const budgetUrl = new URL(