diff --git a/test/pc/e2e/analyzer/video/default_video_quality_analyzer_frames_comparator.cc b/test/pc/e2e/analyzer/video/default_video_quality_analyzer_frames_comparator.cc
index adfe027d94..ef9d32fa1a 100644
--- a/test/pc/e2e/analyzer/video/default_video_quality_analyzer_frames_comparator.cc
+++ b/test/pc/e2e/analyzer/video/default_video_quality_analyzer_frames_comparator.cc
@@ -327,6 +327,7 @@ void DefaultVideoQualityAnalyzerFramesComparator::ProcessComparisons() {
   while (true) {
     // Try to pick next comparison to perform from the queue.
     absl::optional<FrameComparison> comparison = absl::nullopt;
+    bool more_new_comparisons_expected;
     {
       MutexLock lock(&mutex_);
       if (!comparisons_.empty()) {
@@ -336,16 +337,11 @@ void DefaultVideoQualityAnalyzerFramesComparator::ProcessComparisons() {
           comparison_available_event_.Set();
         }
       }
+      // If state is stopped => no new frame comparisons are expected.
+      more_new_comparisons_expected = state_ != State::kStopped;
     }
     if (!comparison) {
-      bool more_frames_expected;
-      {
-        // If there are no comparisons and state is stopped =>
-        // no more frames expected.
-        MutexLock lock(&mutex_);
-        more_frames_expected = state_ != State::kStopped;
-      }
-      if (!more_frames_expected) {
+      if (!more_new_comparisons_expected) {
         comparison_available_event_.Set();
         return;
       }
diff --git a/test/pc/e2e/analyzer/video/default_video_quality_analyzer_frames_comparator_test.cc b/test/pc/e2e/analyzer/video/default_video_quality_analyzer_frames_comparator_test.cc
index 46cf4c414d..adbd97a876 100644
--- a/test/pc/e2e/analyzer/video/default_video_quality_analyzer_frames_comparator_test.cc
+++ b/test/pc/e2e/analyzer/video/default_video_quality_analyzer_frames_comparator_test.cc
@@ -117,7 +117,7 @@ TEST(DefaultVideoQualityAnalyzerFramesComparatorTest,
                            /*captured=*/absl::nullopt,
                            /*rendered=*/absl::nullopt,
                            FrameComparisonType::kRegular, frame_stats);
-  comparator.Stop({});
+  comparator.Stop(/*last_rendered_frame_times=*/{});
 
   std::map<InternalStatsKey, StreamStats> stats = comparator.stream_stats();
   EXPECT_DOUBLE_EQ(GetFirstOrDie(stats.at(stats_key).transport_time_ms), 20.0);
@@ -161,7 +161,7 @@ TEST(DefaultVideoQualityAnalyzerFramesComparatorTest,
                            /*captured=*/absl::nullopt,
                            /*rendered=*/absl::nullopt,
                            FrameComparisonType::kRegular, frame_stats2);
-  comparator.Stop({});
+  comparator.Stop(/*last_rendered_frame_times=*/{});
 
   std::map<InternalStatsKey, StreamStats> stats = comparator.stream_stats();
   EXPECT_DOUBLE_EQ(
@@ -244,7 +244,7 @@ TEST(DefaultVideoQualityAnalyzerFramesComparatorTest,
                            /*rendered=*/absl::nullopt,
                            FrameComparisonType::kRegular,
                            stats[stats.size() - 1]);
-  comparator.Stop({});
+  comparator.Stop(/*last_rendered_frame_times=*/{});
 
   EXPECT_EQ(comparator.stream_stats().size(), 1lu);
   StreamStats result_stats = comparator.stream_stats().at(stats_key);