diff --git a/music/player/src/main/kotlin/dev/schlaubi/mikmusic/player/Queue.kt b/music/player/src/main/kotlin/dev/schlaubi/mikmusic/player/Queue.kt
index b59c0eb55..97bba3d1f 100644
--- a/music/player/src/main/kotlin/dev/schlaubi/mikmusic/player/Queue.kt
+++ b/music/player/src/main/kotlin/dev/schlaubi/mikmusic/player/Queue.kt
@@ -17,8 +17,8 @@ class Queue(private var tracksList: MutableList<QueuedTrack> = mutableListOf())
                     val unShuffled = queue + shuffled.sorted()
 
                     order = LinkedList(unShuffled)
+                    nextIndex = tracksList.size
                 }
-                nextIndex = tracksList.size
             }
             field = value
         }