diff --git a/src/plugins/chromecastPlayer/plugin.js b/src/plugins/chromecastPlayer/plugin.js
index b3f75f7a6d..22242959fe 100644
--- a/src/plugins/chromecastPlayer/plugin.js
+++ b/src/plugins/chromecastPlayer/plugin.js
@@ -548,7 +548,7 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
 
             events.trigger(instance, 'playbackstop', [state]);
 
-            var state = instance.lastPlayerData.PlayState || {};
+            state = instance.lastPlayerData.PlayState || {};
             var volume = state.VolumeLevel || 0.5;
             var mute = state.IsMuted || false;
 
@@ -572,6 +572,7 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
         bindEventForRelay(instance, 'unpause');
         bindEventForRelay(instance, 'volumechange');
         bindEventForRelay(instance, 'repeatmodechange');
+        bindEventForRelay(instance, 'shuffleplaylistmodechange');
 
         events.on(instance._castPlayer, 'playstatechange', function (e, data) {
 
@@ -651,6 +652,7 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
                 'SetSubtitleStreamIndex',
                 'DisplayContent',
                 'SetRepeatMode',
+                'SetPlaylistShuffleMode',
                 'EndSession',
                 'PlayMediaSource',
                 'PlayTrailers'
@@ -864,6 +866,12 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
         return state.RepeatMode;
     };
 
+    ChromecastPlayer.prototype.getPlaylistShuffleMode = function () {
+        var state = this.lastPlayerData || {};
+        state = state.PlayState || {};
+        return state.ShuffleMode;
+    };
+
     ChromecastPlayer.prototype.playTrailers = function (item) {
 
         this._castPlayer.sendMessage({
@@ -884,6 +892,15 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
         });
     };
 
+    ChromecastPlayer.prototype.setPlaylistShuffleMode = function (value) {
+        this._castPlayer.sendMessage({
+            options: {
+                ShuffleMode: value
+            },
+            command: 'SetPlaylistShuffleMode'
+        });
+    };
+
     ChromecastPlayer.prototype.toggleMute = function () {
 
         this._castPlayer.sendMessage({
diff --git a/src/plugins/sessionPlayer/plugin.js b/src/plugins/sessionPlayer/plugin.js
index 241d3fba48..b607f04417 100644
--- a/src/plugins/sessionPlayer/plugin.js
+++ b/src/plugins/sessionPlayer/plugin.js
@@ -513,6 +513,10 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
         });
     };
 
+    SessionPlayer.prototype.getPlaylistShuffleMode = function () {
+
+    };
+
     SessionPlayer.prototype.displayContent = function (options) {
 
         sendCommandByName(this, 'DisplayContent', options);
diff --git a/src/scripts/serverNotifications.js b/src/scripts/serverNotifications.js
index 2553c284f0..77c51f33c1 100644
--- a/src/scripts/serverNotifications.js
+++ b/src/scripts/serverNotifications.js
@@ -65,6 +65,9 @@ define(['connectionManager', 'playbackManager', 'syncPlayManager', 'events', 'in
             case 'SetRepeatMode':
                 playbackManager.setRepeatMode(cmd.Arguments.RepeatMode);
                 break;
+            case 'SetPlaylistShuffleMode':
+                playbackManager.setPlaylistShuffleMode(cmd.Arguments.ShuffleMode);
+                break;
             case 'VolumeUp':
                 inputManager.trigger('volumeup');
                 return;