diff --git a/internal-packages/run-engine/src/engine/systems/waitpointSystem.ts b/internal-packages/run-engine/src/engine/systems/waitpointSystem.ts
index b2eb9e539..2d4d6b338 100644
--- a/internal-packages/run-engine/src/engine/systems/waitpointSystem.ts
+++ b/internal-packages/run-engine/src/engine/systems/waitpointSystem.ts
@@ -422,7 +422,8 @@ export class WaitpointSystem {
           environmentType: snapshot.environmentType,
           projectId: snapshot.projectId,
           organizationId: snapshot.organizationId,
-          batchId: batch?.id ?? snapshot.batchId ?? undefined,
+          // Do NOT carry over the batchId from the previous snapshot
+          batchId: batch?.id,
           workerId,
           runnerId,
         });