diff --git a/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt b/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt
index 997e355a9..19b7136a8 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt
@@ -377,7 +377,17 @@ class PlaybackService :
     }
 
     override fun playNext(songs: List<Song>, ack: StateAck.PlayNext) {
-        val nextIndex = player.nextMediaItemIndex
+        val currTimeline = player.currentTimeline
+        val nextIndex =
+            if (currTimeline.isEmpty) {
+                C.INDEX_UNSET
+            } else {
+                currTimeline.getNextWindowIndex(
+                    player.currentMediaItemIndex,
+                    Player.REPEAT_MODE_OFF,
+                    player.shuffleModeEnabled
+                )
+            }
 
         if (nextIndex == C.INDEX_UNSET) {
             player.addMediaItems(songs.map { it.toMediaItem() })