diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DebugRenderersFactory.java b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DebugRenderersFactory.java
index 17b422d30c..01b6ebb190 100644
--- a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DebugRenderersFactory.java
+++ b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DebugRenderersFactory.java
@@ -140,10 +140,11 @@ import java.util.ArrayList;
     protected void resetCodecStateForFlush() {
       super.resetCodecStateForFlush();
       clearTimestamps();
+      // Check if there is a format change on the input side still pending propagation to the
+      // output.
+      inputFormatChanged = !inputFormatChangeTimesUs.isEmpty();
       inputFormatChangeTimesUs.clear();
-      inputFormatChanged = false;
       outputMediaFormatChanged = false;
-      currentMediaFormat = null;
     }
 
     @Override