diff --git a/src/NadekoBot/Modules/Music/Classes/MusicControls.cs b/src/NadekoBot/Modules/Music/Classes/MusicControls.cs
index a918fc11..53a2c736 100644
--- a/src/NadekoBot/Modules/Music/Classes/MusicControls.cs
+++ b/src/NadekoBot/Modules/Music/Classes/MusicControls.cs
@@ -188,7 +188,9 @@ namespace NadekoBot.Modules.Music.Classes
         {
             actionQueue.Enqueue(() =>
             {
-                playlist.Shuffle();
+                var oldPlaylist = playlist.ToArray();
+                playlist.Clear();
+                playlist.AddRange(oldPlaylist.Shuffle());
             });
         }