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 fd8477913..0ebaf669f 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
@@ -418,7 +418,7 @@ class PlaybackStateManagerImpl @Inject constructor() : PlaybackStateManager {
         }
 
         this.stateHolder = stateHolder
-        if (isInitialized) {
+        if (isInitialized && stateMirror.index > -1) {
             stateHolder.applySavedState(stateMirror.parent, stateMirror.rawQueue, null)
             stateHolder.seekTo(stateMirror.progression.calculateElapsedPositionMs())
             stateHolder.playing(false)
@@ -753,7 +753,7 @@ class PlaybackStateManagerImpl @Inject constructor() : PlaybackStateManager {
         }
 
         var index = savedState.index
-        while (pointingAtSong() && index > -1) {
+        while (!pointingAtSong() && index > -1) {
             index--
         }