diff --git a/app/src/main/java/org/oxycblt/auxio/playback/service/ExoPlaybackStateHolder.kt b/app/src/main/java/org/oxycblt/auxio/playback/service/ExoPlaybackStateHolder.kt
index 05ec3d9f2..4c58aa533 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/service/ExoPlaybackStateHolder.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/service/ExoPlaybackStateHolder.kt
@@ -30,6 +30,7 @@ import androidx.media3.decoder.ffmpeg.FfmpegAudioRenderer
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.exoplayer.RenderersFactory
 import androidx.media3.exoplayer.audio.AudioCapabilities
+import androidx.media3.exoplayer.audio.DefaultAudioSink
 import androidx.media3.exoplayer.audio.MediaCodecAudioRenderer
 import androidx.media3.exoplayer.mediacodec.MediaCodecSelector
 import androidx.media3.exoplayer.source.MediaSource
@@ -607,8 +608,7 @@ class ExoPlaybackStateHolder(
                         MediaCodecSelector.DEFAULT,
                         handler,
                         audioListener,
-                        AudioCapabilities.DEFAULT_AUDIO_CAPABILITIES,
-                        replayGainProcessor))
+                        DefaultAudioSink.Builder(context).setAudioProcessors(arrayOf(replayGainProcessor)).build()))
             }
 
             val exoPlayer =
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/service/SystemModule.kt b/app/src/main/java/org/oxycblt/auxio/playback/service/SystemModule.kt
index 3aade8f3e..cda467cfb 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/service/SystemModule.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/service/SystemModule.kt
@@ -30,6 +30,7 @@ import androidx.media3.extractor.mp3.Mp3Extractor
 import androidx.media3.extractor.mp4.FragmentedMp4Extractor
 import androidx.media3.extractor.mp4.Mp4Extractor
 import androidx.media3.extractor.ogg.OggExtractor
+import androidx.media3.extractor.text.DefaultSubtitleParserFactory
 import androidx.media3.extractor.ts.AdtsExtractor
 import androidx.media3.extractor.wav.WavExtractor
 import dagger.Module
@@ -60,10 +61,10 @@ class SystemModule {
         arrayOf(
             FlacExtractor(),
             WavExtractor(),
-            FragmentedMp4Extractor(),
-            Mp4Extractor(),
+            FragmentedMp4Extractor(DefaultSubtitleParserFactory.UNSUPPORTED),
+            Mp4Extractor(DefaultSubtitleParserFactory.UNSUPPORTED),
             OggExtractor(),
-            MatroskaExtractor(),
+            MatroskaExtractor(DefaultSubtitleParserFactory.UNSUPPORTED),
             // Enable constant bitrate seeking so that certain MP3s/AACs are seekable
             AdtsExtractor(AdtsExtractor.FLAG_ENABLE_CONSTANT_BITRATE_SEEKING),
             Mp3Extractor(Mp3Extractor.FLAG_ENABLE_CONSTANT_BITRATE_SEEKING))