diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/JukeboxMediaPlayer.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/JukeboxMediaPlayer.kt
index f2442a44..f43297db 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/JukeboxMediaPlayer.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/JukeboxMediaPlayer.kt
@@ -384,7 +384,7 @@ class JukeboxMediaPlayer : JukeboxUnimplementedFunctions(), Player {
         if (currentIndex < 0 || currentIndex >= playlist.size) return
         if (newIndex < 0 || newIndex >= playlist.size) return
 
-        val insertIndex = if (newIndex < currentIndex) newIndex else newIndex - 1
+        val insertIndex = if (newIndex < currentIndex) newIndex else (newIndex - 1).coerceAtLeast(0)
         val item = playlist.removeAt(currentIndex)
         playlist.add(insertIndex, item)
         updatePlaylist()