diff --git a/src/Tools/Replay/Replay.cs b/src/Tools/Replay/Replay.cs
index 47c4550450a52..2aecc5943a7cf 100644
--- a/src/Tools/Replay/Replay.cs
+++ b/src/Tools/Replay/Replay.cs
@@ -158,7 +158,7 @@ static async IAsyncEnumerable<BuildData> BuildAllAsync(
 
         var buildData = await completedTask.ConfigureAwait(false);
         yield return buildData;
-    } while (tasks.Count > 0);
+    } while (index < compilerCalls.Count);
 
     string GetOutputName(CompilerCall compilerCall)
     {