diff --git a/packages/forge/blocks/openai/actions/askAssistant.tsx b/packages/forge/blocks/openai/actions/askAssistant.tsx
index d414c4d5a..cdba85134 100644
--- a/packages/forge/blocks/openai/actions/askAssistant.tsx
+++ b/packages/forge/blocks/openai/actions/askAssistant.tsx
@@ -270,8 +270,7 @@ const createAssistantStream = async ({
     )
     if (threadIdResponseMapping?.variableId)
       variables.set(threadIdResponseMapping.variableId, currentThreadId)
-
-    if (threadVariableId) variables.set(threadVariableId, currentThreadId)
+    else if (threadVariableId) variables.set(threadVariableId, currentThreadId)
   }
 
   if (!currentThreadId) {