diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java
index 014c13339..76fed8e9e 100644
--- a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java
@@ -436,14 +436,16 @@ public abstract class PlayQueue implements Serializable {
      * top, so shuffling a size-2 list does nothing)
      */
     public synchronized void shuffle() {
+        // Create a backup if it doesn't already exist
+        // Note: The backup-list has to be created at all cost (even when size <= 2).
+        // Otherwise it's not possible to enter shuffle-mode!
+        if (backup == null) {
+            backup = new ArrayList<>(streams);
+        }
         // Can't shuffle an list that's empty or only has one element
         if (size() <= 2) {
             return;
         }
-        // Create a backup if it doesn't already exist
-        if (backup == null) {
-            backup = new ArrayList<>(streams);
-        }
 
         final int originalIndex = getIndex();
         final PlayQueueItem currentItem = getItem();