diff --git a/apps/web/src/components/BranchToolbar.tsx b/apps/web/src/components/BranchToolbar.tsx
index 30e9327060664b1012d1b59b8a910e34042b6c43..d02c94db95dc9b6d4b852d47be16d3dd9cdde3f9 100644
--- a/apps/web/src/components/BranchToolbar.tsx
+++ b/apps/web/src/components/BranchToolbar.tsx
@@ -94,7 +94,7 @@ export default function BranchToolbar({
       activeThreadBranch,
       queryBranches,
     });
-    if (!syncedBranch) return;
+    if (!activeThreadId || !syncedBranch) return;
 
     dispatch({
       type: "SET_THREAD_BRANCH",