diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java
index fb1ca234217..3241d491002 100644
--- a/app/src/main/java/org/schabi/newpipe/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -454,6 +454,12 @@ protected void onDestroy() {
         if (!isChangingConfigurations()) {
             StateSaver.clearStateFiles();
         }
+
+        SharedPreferences sharedPreferences =
+                this.getSharedPreferences("play_mode_state", MODE_PRIVATE);
+        SharedPreferences.Editor editor = sharedPreferences.edit();
+        editor.putBoolean("shuffle_mode", false);
+        editor.apply();
     }
 
     @Override
diff --git a/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java b/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
index 1a8c98fd220..b940d5364d6 100644
--- a/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
@@ -19,6 +19,7 @@
 
 package org.schabi.newpipe.player;
 
+import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -398,6 +399,11 @@ protected void initPlayback(@NonNull final PlayQueue queue,
                                 final boolean isMuted) {
         destroyPlayer();
         initPlayer(playOnReady);
+        SharedPreferences sharedPreferences =
+                context.getSharedPreferences("play_mode_state", Activity.MODE_PRIVATE);
+        boolean shuffleMode = sharedPreferences.getBoolean("shuffle_mode", false);
+        simpleExoPlayer.setShuffleModeEnabled(shuffleMode);
+
         setRepeatMode(repeatMode);
         setPlaybackParameters(playbackSpeed, playbackPitch, playbackSkipSilence);
 
@@ -664,6 +670,11 @@ public void onShuffleClicked() {
         if (simpleExoPlayer == null) {
             return;
         }
+        SharedPreferences sharedPreferences =
+                context.getSharedPreferences("play_mode_state", Activity.MODE_PRIVATE);
+        SharedPreferences.Editor editor = sharedPreferences.edit();
+        editor.putBoolean("shuffle_mode", !simpleExoPlayer.getShuffleModeEnabled());
+        editor.apply();
         simpleExoPlayer.setShuffleModeEnabled(!simpleExoPlayer.getShuffleModeEnabled());
     }
     /*//////////////////////////////////////////////////////////////////////////