diff --git a/library/src/main/java/com/google/android/exoplayer/MediaCodecAudioTrackRenderer.java b/library/src/main/java/com/google/android/exoplayer/MediaCodecAudioTrackRenderer.java
index 5cba5dd99a..a9e201e008 100644
--- a/library/src/main/java/com/google/android/exoplayer/MediaCodecAudioTrackRenderer.java
+++ b/library/src/main/java/com/google/android/exoplayer/MediaCodecAudioTrackRenderer.java
@@ -576,9 +576,12 @@ public class MediaCodecAudioTrackRenderer extends MediaCodecTrackRenderer {
 
   @Override
   protected void onDisabled() {
-    super.onDisabled();
-    releaseAudioTrack();
     audioSessionId = 0;
+    try {
+      releaseAudioTrack();
+    } finally {
+      super.onDisabled();
+    }
   }
 
   @Override