diff --git a/flow/workflows/sync_flow.go b/flow/workflows/sync_flow.go
index 5272e1dbdb..d9b7d82f0b 100644
--- a/flow/workflows/sync_flow.go
+++ b/flow/workflows/sync_flow.go
@@ -207,7 +207,7 @@ func SyncFlowWorkflow(
 		}
 
 		restart := currentSyncFlowNum >= maxSyncsPerSyncFlow || syncErr
-		if mustWait {
+		if !stop && mustWait {
 			waitSelector.Select(ctx)
 			if restart {
 				// must flush selector for signals received while waiting