diff --git a/apps/viewer/src/test/transcript.spec.ts b/apps/viewer/src/test/transcript.spec.ts
index f8a1bda00..c93879989 100644
--- a/apps/viewer/src/test/transcript.spec.ts
+++ b/apps/viewer/src/test/transcript.spec.ts
@@ -26,7 +26,7 @@ test('Transcript set variable should be correctly computed', async ({
     page.getByText('Assistant: "How are you? You said hey"')
   ).toBeVisible()
   await expect(
-    page.getByText('Assistant: "How are you? You said hey 3"')
+    page.getByText('Assistant: "How are you? You said hey 2"')
   ).toBeVisible()
   await expect(page.getByText('User: "hey"')).toBeVisible()
   await expect(page.getByText('User: "hey 2"')).toBeVisible()
diff --git a/packages/logic/computeResultTranscript.ts b/packages/logic/computeResultTranscript.ts
index 8d7177f64..aff2e0d30 100644
--- a/packages/logic/computeResultTranscript.ts
+++ b/packages/logic/computeResultTranscript.ts
@@ -132,7 +132,7 @@ const executeGroup = ({
     nextGroup.blockIndex ?? 0
   )) {
     if (stopAtBlockId && block.id === stopAtBlockId) return currentTranscript
-    while (setVariableHistory.at(0)?.blockId === block.id)
+    if (setVariableHistory.at(0)?.blockId === block.id)
       typebotsQueue[0].typebot.variables = applySetVariable(
         setVariableHistory.shift(),
         typebotsQueue[0].typebot