diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/PlayQueue.java b/libresonic-main/src/main/java/org/libresonic/player/domain/PlayQueue.java
index 16401e34..2cc2ae42 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/PlayQueue.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/PlayQueue.java
@@ -241,7 +241,8 @@ public class PlayQueue {
         MediaFile currentFile = getCurrentFile();
         Collections.shuffle(files);
         if (currentFile != null) {
-            index = files.indexOf(currentFile);
+            Collections.swap(files, files.indexOf(currentFile), 0);
+            index = 0;
         }
     }