diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index 45d0bd1726..9716a4e854 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -2047,7 +2047,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
     }
 
     private void handleFrameRendered(long presentationTimeUs) {
-      if (this != tunnelingOnFrameRenderedListener) {
+      if (this != tunnelingOnFrameRenderedListener || getCodec() == null) {
         // Stale event.
         return;
       }