diff --git a/music/src/main/java/de/mm20/launcher2/music/MusicRepository.kt b/music/src/main/java/de/mm20/launcher2/music/MusicRepository.kt
index 4a854b6a..9ca6f775 100644
--- a/music/src/main/java/de/mm20/launcher2/music/MusicRepository.kt
+++ b/music/src/main/java/de/mm20/launcher2/music/MusicRepository.kt
@@ -141,25 +141,26 @@ class MusicRepositoryImpl(
             allowedCommands: SessionCommandGroup
         ) {
             super.onConnected(controller, allowedCommands)
-            if (!controller.isConnected) return
+            if (controller != mediaController) return
             updateMetadata(controller.currentMediaItem, controller.connectedToken?.packageName)
             updateState(controller.playerState)
         }
 
         override fun onCurrentMediaItemChanged(controller: MediaController, item: MediaItem?) {
             super.onCurrentMediaItemChanged(controller, item)
-            if (!controller.isConnected) return
+            if (controller != mediaController) return
             updateMetadata(item, controller.connectedToken?.packageName)
         }
 
         override fun onPlayerStateChanged(controller: MediaController, state: Int) {
             super.onPlayerStateChanged(controller, state)
-            if (!controller.isConnected) return
+            if (controller != mediaController) return
             updateState(state)
         }
 
         override fun onDisconnected(controller: MediaController) {
             super.onDisconnected(controller)
+            if (controller != mediaController) return
             mediaController = null
         }
     }