diff --git a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt
index f03884f8d..2eacddff5 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt
@@ -766,12 +766,12 @@ class PlaybackStateManagerImpl @Inject constructor() : PlaybackStateManager {
         val rawQueue =
             RawQueue(
                 heap = heap,
-                shuffledMapping = savedState.shuffledMapping,
+                shuffledMapping = shuffledMapping,
                 heapIndex =
-                    if (savedState.shuffledMapping.isNotEmpty()) {
-                        savedState.shuffledMapping[savedState.index]
+                    if (shuffledMapping.isNotEmpty()) {
+                        shuffledMapping[savedState.index]
                     } else {
-                        savedState.index
+                        index
                     })
 
         val oldStateMirror = stateMirror