diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index cc604b5a5a..0edff22658 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -35,6 +35,8 @@
 * DownloadManager:
   * Create only one task for all DownloadActions for the same content.
   * Rename TaskState to DownloadState.
+* MP3: Fix issue where streams would play twice on some Samsung devices
+  ([#4519](https://github.com/google/ExoPlayer/issues/4519)).
 
 ### 2.9.2 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
index 893601a859..f6cc6a8344 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
@@ -318,7 +318,20 @@ public final class MediaCodecUtil {
     }
 
     // Work around https://github.com/google/ExoPlayer/issues/4519.
-    if ("OMX.SEC.mp3.dec".equals(name) && "SM-T530".equals(Util.MODEL)) {
+    if ("OMX.SEC.mp3.dec".equals(name)
+        && ("GT-I9152".equals(Util.MODEL)
+            || "GT-I9515".equals(Util.MODEL)
+            || "GT-P5220".equals(Util.MODEL)
+            || "GT-S7580".equals(Util.MODEL)
+            || "SM-G350".equals(Util.MODEL)
+            || "SM-T231".equals(Util.MODEL)
+            || "SM-T530".equals(Util.MODEL))) {
+      return false;
+    }
+    if ("OMX.brcm.audio.mp3.decoder".equals(name)
+        && ("GT-I9152".equals(Util.MODEL)
+            || "GT-S7580".equals(Util.MODEL)
+            || "SM-G350".equals(Util.MODEL))) {
       return false;
     }