diff --git a/app/src/main/java/org/oxycblt/auxio/music/service/MusicMediaItemBrowser.kt b/app/src/main/java/org/oxycblt/auxio/music/service/MusicMediaItemBrowser.kt
index 83831f510..bf5e5a519 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/service/MusicMediaItemBrowser.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/service/MusicMediaItemBrowser.kt
@@ -55,11 +55,13 @@ constructor(
     }
 
     fun release() {
+        browserJob.cancel()
         musicRepository.removeUpdateListener(this)
     }
 
     override fun onMusicChanges(changes: MusicRepository.Changes) {
-        if (changes.deviceLibrary) {
+        val deviceLibrary = musicRepository.deviceLibrary
+        if (changes.deviceLibrary && deviceLibrary != null) {
             for (entry in searchResults.entries) {
                 entry.value.cancel()
             }
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/service/MediaSessionPlayer.kt b/app/src/main/java/org/oxycblt/auxio/playback/service/MediaSessionPlayer.kt
index db7d5c408..0e52d38b3 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/service/MediaSessionPlayer.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/service/MediaSessionPlayer.kt
@@ -30,6 +30,7 @@ import androidx.media3.common.MediaMetadata
 import androidx.media3.common.PlaybackParameters
 import androidx.media3.common.Player
 import androidx.media3.common.TrackSelectionParameters
+import java.lang.Exception
 import org.oxycblt.auxio.music.Album
 import org.oxycblt.auxio.music.Artist
 import org.oxycblt.auxio.music.Genre