diff --git a/MediaBrowser.Controller/SyncPlay/Queue/PlayQueueManager.cs b/MediaBrowser.Controller/SyncPlay/Queue/PlayQueueManager.cs
index aca50f80a..6373a5211 100644
--- a/MediaBrowser.Controller/SyncPlay/Queue/PlayQueueManager.cs
+++ b/MediaBrowser.Controller/SyncPlay/Queue/PlayQueueManager.cs
@@ -486,7 +486,10 @@ namespace MediaBrowser.Controller.SyncPlay
                     ShufflePlaylist();
                     break;
                 default:
+                if (!ShuffleMode.Equals(mode))
+                { 
                     SortShuffledPlaylist();
+                }
                     break;
             }
         }