diff --git a/library/src/main/java/com/google/android/exoplayer/MediaCodecUtil.java b/library/src/main/java/com/google/android/exoplayer/MediaCodecUtil.java
index f7d3e70b45..8380108f29 100644
--- a/library/src/main/java/com/google/android/exoplayer/MediaCodecUtil.java
+++ b/library/src/main/java/com/google/android/exoplayer/MediaCodecUtil.java
@@ -183,8 +183,9 @@ public final class MediaCodecUtil {
       return false;
     }
 
-    // Work around broken AAC decoders.
+    // Work around broken audio decoders.
     if ((Util.SDK_INT < 18 && "CIPAACDecoder".equals(name))
+        || (Util.SDK_INT < 18 && "CIPMP3Decoder".equals(name))
         || (Util.SDK_INT < 20 && "AACDecoder".equals(name))) {
       return false;
     }