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 c8df60e71..13dba0e3a 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
@@ -161,9 +161,9 @@ class PlaybackStateManager private constructor() {
                 mParent = null
 
                 mQueue = if (shouldShuffle) {
-                    musicStore.songs.toMutableList()
-                } else {
                     genShuffle(musicStore.songs.toMutableList(), false)
+                } else {
+                    musicStore.songs.toMutableList()
                 }
             }
 
@@ -198,7 +198,6 @@ class PlaybackStateManager private constructor() {
                 } else {
                     orderSongsInAlbum(song.album)
                 }
-                mMode = mode
             }
         }