diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index cf3b3882200..ead8d64163f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -854,6 +854,19 @@ protected boolean flushOrReleaseCodec() {
       releaseCodec();
       return true;
     }
+    if (codecDrainAction == DRAIN_ACTION_FLUSH_AND_UPDATE_DRM_SESSION) {
+      checkState(Util.SDK_INT >= 23); // Implied by DRAIN_ACTION_FLUSH_AND_UPDATE_DRM_SESSION
+      // Needed to keep lint happy (it doesn't understand the checkState call alone)
+      if (Util.SDK_INT >= 23) {
+        try {
+          updateDrmSessionV23();
+        } catch (ExoPlaybackException e) {
+          Log.w(TAG, "Failed to update the DRM session, releasing the codec instead.", e);
+          releaseCodec();
+          return true;
+        }
+      }
+    }
     flushCodec();
     return false;
   }