diff --git a/apps/ai-game-creator-shell/src/features/app-shell/WorkspaceLauncher.tsx b/apps/ai-game-creator-shell/src/features/app-shell/WorkspaceLauncher.tsx
index bca56303b..1d4ccf8e5 100644
--- a/apps/ai-game-creator-shell/src/features/app-shell/WorkspaceLauncher.tsx
+++ b/apps/ai-game-creator-shell/src/features/app-shell/WorkspaceLauncher.tsx
@@ -91,6 +91,9 @@ export function WorkspaceLauncherShell({
       currentProjectContext?.startMode === 'planning' ? 'design' : 'game',
     );
   }, [currentProjectContext?.projectPath, currentProjectContext?.startMode]);
+  const planningStartMode =
+    currentProjectContext?.startMode === 'planning' &&
+    (agentRuntimeMode === 'design' || !suppressInitialGameTurn);
   const activeProjectContextRef = useRef(currentProjectContext);
   const manifestMergeRef = useRef<ProjectManifestMergeState | null>(null);
   activeProjectContextRef.current = currentProjectContext;
@@ -349,10 +352,7 @@ export function WorkspaceLauncherShell({
             preview={activeProjectPreview}
             agentRuntimeSummaries={activeProjectAgentRuntimeSummaries}
             agentResults={activeProjectAgentResults}
-            planningStartMode={
-              agentRuntimeMode === 'design' &&
-              currentProjectContext.startMode === 'planning'
-            }
+            planningStartMode={planningStartMode}
             onPlay={() =>
               requestCurrentProjectPlay(currentProjectContext.projectPath)
             }
@@ -382,10 +382,7 @@ export function WorkspaceLauncherShell({
                 }
                 orchestrationMode="single-supervisor"
                 projectSupervisorOnly
-                planningStartMode={
-                  agentRuntimeMode === 'design' &&
-                  currentProjectContext.startMode === 'planning'
-                }
+                planningStartMode={planningStartMode}
                 playRequest={playRequest}
                 onPlayRequestHandled={handlePlayRequestHandled}
                 onManifestChange={syncActiveProjectManifest}