diff --git a/homeassistant/components/media_player/spotify.py b/homeassistant/components/media_player/spotify.py
index 229dcd88691..8ceb245eb03 100644
--- a/homeassistant/components/media_player/spotify.py
+++ b/homeassistant/components/media_player/spotify.py
@@ -176,6 +176,7 @@ class SpotifyMediaPlayer(MediaPlayerDevice):
         self._state = STATE_PAUSED
         if current.get('is_playing'):
             self._state = STATE_PLAYING
+        self._shuffle = current.get('shuffle_state')
         device = current.get('device')
         if device is None:
             self._state = STATE_IDLE
@@ -184,8 +185,6 @@ class SpotifyMediaPlayer(MediaPlayerDevice):
                 self._volume = device.get('volume_percent') / 100
             if device.get('name'):
                 self._current_device = device.get('name')
-            if device.get('shuffle_state'):
-                self._shuffle = device.get('shuffle_state')
 
     def set_volume_level(self, volume):
         """Set the volume level."""