diff --git a/shell/services/MprisService.qml b/shell/services/MprisService.qml
index bf3a61f..b33ca06 100644
--- a/shell/services/MprisService.qml
+++ b/shell/services/MprisService.qml
@@ -30,10 +30,11 @@ QtObject {
                 playerIdx = idx;
                 return;
             }
+            // Selected player disappeared - switch to best alternative
+            _switchToBest();
+        } else if (playerIdx >= players.length) {
+            playerIdx = 0;
         }
-
-        // Selected player disappeared - switch to most recently playing
-        _switchToBest();
     }
 
     // Watch playback state changes on all players