diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/DefaultMediaCodecAdapterFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/DefaultMediaCodecAdapterFactory.java
index 2f12468f9e..9679bb0eab 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/DefaultMediaCodecAdapterFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/DefaultMediaCodecAdapterFactory.java
@@ -51,6 +51,7 @@ public final class DefaultMediaCodecAdapterFactory implements MediaCodecAdapter.
 
   public DefaultMediaCodecAdapterFactory() {
     asynchronousMode = MODE_DEFAULT;
+    enableImmediateCodecStartAfterFlush = true;
   }
 
   /**
@@ -92,7 +93,7 @@ public final class DefaultMediaCodecAdapterFactory implements MediaCodecAdapter.
    * playback thread, when operating the codec in asynchronous mode. If disabled, {@link
    * MediaCodec#start} will be called by the callback thread after pending callbacks are handled.
    *
-   * <p>By default, this feature is disabled.
+   * <p>By default, this feature is enabled.
    *
    * <p>This method is experimental, and will be renamed or removed in a future release.
    *