diff --git a/shell/services/MprisService.qml b/shell/services/MprisService.qml
index c88aefa..5cb628f 100644
--- a/shell/services/MprisService.qml
+++ b/shell/services/MprisService.qml
@@ -28,8 +28,8 @@ QtObject {
             } else {
                 _switchToBest();
             }
-        } else if (playerIdx >= players.length) {
-            playerIdx = 0;
+        } else {
+            _switchToBest();
         }
     }