diff --git a/MediaBrowser.Common/Extensions/ShuffleExtensions.cs b/MediaBrowser.Common/Extensions/ShuffleExtensions.cs
index 459bec1105..6f0ea9bd58 100644
--- a/MediaBrowser.Common/Extensions/ShuffleExtensions.cs
+++ b/MediaBrowser.Common/Extensions/ShuffleExtensions.cs
@@ -33,8 +33,7 @@ namespace MediaBrowser.Common.Extensions
             int n = list.Count;
             while (n > 1)
             {
-                n--;
-                int k = rng.Next(n + 1);
+                int k = rng.Next(n--);
                 T value = list[k];
                 list[k] = list[n];
                 list[n] = value;