diff --git a/app/src/main/java/org/thoughtcrime/securesms/video/exo/ExoPlayer.kt b/app/src/main/java/org/thoughtcrime/securesms/video/exo/ExoPlayer.kt
index 5877676fb3..83baaaf1af 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/video/exo/ExoPlayer.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/video/exo/ExoPlayer.kt
@@ -1,14 +1,21 @@
 package org.thoughtcrime.securesms.video.exo
 
+import androidx.media3.common.C
 import androidx.media3.common.Player
 import androidx.media3.exoplayer.ExoPlayer
 
 fun ExoPlayer.configureForGifPlayback() {
   repeatMode = Player.REPEAT_MODE_ALL
   volume = 0f
+  trackSelectionParameters = trackSelectionParameters.buildUpon()
+    .setTrackTypeDisabled(C.TRACK_TYPE_AUDIO, true)
+    .build()
 }
 
 fun ExoPlayer.configureForVideoPlayback() {
   repeatMode = Player.REPEAT_MODE_OFF
   volume = 1f
+  trackSelectionParameters = trackSelectionParameters.buildUpon()
+    .setTrackTypeDisabled(C.TRACK_TYPE_AUDIO, false)
+    .build()
 }
diff --git a/app/src/test/java/org/thoughtcrime/securesms/video/exo/ExoPlayerPoolTest.kt b/app/src/test/java/org/thoughtcrime/securesms/video/exo/ExoPlayerPoolTest.kt
index 6cf5ecea44..d3b94c9f20 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/video/exo/ExoPlayerPoolTest.kt
+++ b/app/src/test/java/org/thoughtcrime/securesms/video/exo/ExoPlayerPoolTest.kt
@@ -1,7 +1,9 @@
 package org.thoughtcrime.securesms.video.exo
 
 import android.app.Application
+import androidx.media3.common.TrackSelectionParameters
 import androidx.media3.exoplayer.ExoPlayer
+import io.mockk.every
 import io.mockk.mockk
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertThrows
@@ -84,7 +86,9 @@ class ExoPlayerPoolTest {
   ): ExoPlayerPool<ExoPlayer> {
     return object : ExoPlayerPool<ExoPlayer>(maximumReservedPlayers) {
       override fun createPlayer(): ExoPlayer {
-        return mockk<ExoPlayer>(relaxUnitFun = true)
+        return mockk<ExoPlayer>(relaxUnitFun = true) {
+          every { trackSelectionParameters } returns TrackSelectionParameters.DEFAULT
+        }
       }
 
       override fun getMaxSimultaneousPlayback(): Int {