diff --git a/app/src/main/java/org/oxycblt/auxio/settings/SettingsManager.kt b/app/src/main/java/org/oxycblt/auxio/settings/SettingsManager.kt
index 47f5bdbdb..97a4697df 100644
--- a/app/src/main/java/org/oxycblt/auxio/settings/SettingsManager.kt
+++ b/app/src/main/java/org/oxycblt/auxio/settings/SettingsManager.kt
@@ -119,7 +119,7 @@ class SettingsManager private constructor(context: Context) :
      * Whether shuffle should stay on when a new song is selected.
      */
     val keepShuffle: Boolean
-        get() = sharedPrefs.getBoolean(Keys.KEY_KEEP_SHUFFLE, false)
+        get() = sharedPrefs.getBoolean(Keys.KEY_KEEP_SHUFFLE, true)
 
     /**
      * Whether to rewind when the back button is pressed.
diff --git a/app/src/main/res/xml/prefs_main.xml b/app/src/main/res/xml/prefs_main.xml
index 762dfe338..cf52e00ad 100644
--- a/app/src/main/res/xml/prefs_main.xml
+++ b/app/src/main/res/xml/prefs_main.xml
@@ -113,7 +113,7 @@
 
         <SwitchPreferenceCompat
             android:title="@string/setting_behavior_keep_shuffle"
-            app:defaultValue="false"
+            app:defaultValue="true"
             app:iconSpaceReserved="false"
             app:key="KEY_KEEP_SHUFFLE"
             app:summary="@string/setting_behavior_keep_shuffle_desc" />