diff --git a/app/src/main/java/org/oxycblt/auxio/playback/service/PlaybackServiceFragment.kt b/app/src/main/java/org/oxycblt/auxio/playback/service/PlaybackServiceFragment.kt
index 32e60cf7d..ee2d281ed 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/service/PlaybackServiceFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/service/PlaybackServiceFragment.kt
@@ -362,7 +362,14 @@ constructor(
     }
 
     override fun playNext(songs: List<Song>, ack: StateAck.PlayNext) {
-        player.addMediaItems(player.nextMediaItemIndex, songs.map { it.toMediaItem() })
+        val nextIndex = player.nextMediaItemIndex
+
+        if (nextIndex == C.INDEX_UNSET) {
+            player.addMediaItems(songs.map { it.toMediaItem() })
+        } else {
+            player.addMediaItems(nextIndex, songs.map { it.toMediaItem() })
+        }
+
         playbackManager.ack(this, ack)
         deferSave()
     }