diff --git a/apps/ai-game-creator-shell/src/App.tsx b/apps/ai-game-creator-shell/src/App.tsx
index 777fa7ca7..fe040c616 100644
--- a/apps/ai-game-creator-shell/src/App.tsx
+++ b/apps/ai-game-creator-shell/src/App.tsx
@@ -6067,11 +6067,15 @@ export function App({
       return;
     }
 
-    const clientTurnId = createDirectCodexConversationTurnId();
-    const userItem = chatComposerDraftToDirectCodexUserItem(
-      { text: prompt, references, content: chatContent },
-      directCodexConversationMessageId(clientTurnId, 'user'),
-    );
+    const clientTurnId = directCodexProductRuntime
+      ? createDirectCodexConversationTurnId()
+      : undefined;
+    const userItem = clientTurnId
+      ? chatComposerDraftToDirectCodexUserItem(
+          { text: prompt, references, content: chatContent },
+          directCodexConversationMessageId(clientTurnId, 'user'),
+        )
+      : undefined;
     void executeChatAgentReply({ prompt, references, userItem, clientTurnId });
   }