diff --git a/apps/ai-game-creator-shell/src/App.tsx b/apps/ai-game-creator-shell/src/App.tsx
index a8e5c83fc..d5fb40130 100644
--- a/apps/ai-game-creator-shell/src/App.tsx
+++ b/apps/ai-game-creator-shell/src/App.tsx
@@ -11935,6 +11935,9 @@ export function App({
               limit: CONVERSATION_VISIBLE_STEP,
             },
           );
+          if (localProjectPathRef.current !== projectPath) {
+            return;
+          }
           const older = directThreadHistoryItemsToMessages(slice.items).map(
             (message) => ({
               role: