diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/AsynchronousMediaCodecAdapter.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/AsynchronousMediaCodecAdapter.java
index 8302bd2903..63b4f65a4c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/AsynchronousMediaCodecAdapter.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/AsynchronousMediaCodecAdapter.java
@@ -289,6 +289,7 @@ import java.nio.ByteBuffer;
 
   @Override
   public void signalEndOfInputStream() {
+    maybeBlockOnQueueing();
     codec.signalEndOfInputStream();
   }