diff --git a/homeassistant/components/frontend/www_static/home-assistant-polymer b/homeassistant/components/frontend/www_static/home-assistant-polymer
index 9637d5d2651..b0b12e20e0f 160000
--- a/homeassistant/components/frontend/www_static/home-assistant-polymer
+++ b/homeassistant/components/frontend/www_static/home-assistant-polymer
@@ -1 +1 @@
-Subproject commit 9637d5d26516873b8a04a3c62b9596163c822a2d
+Subproject commit b0b12e20e0f61df849c414c2dfbcf9923f784631
diff --git a/homeassistant/components/media_player/sonos.py b/homeassistant/components/media_player/sonos.py
index 3deacd84e10..1f299486047 100644
--- a/homeassistant/components/media_player/sonos.py
+++ b/homeassistant/components/media_player/sonos.py
@@ -57,6 +57,7 @@ class SonosDevice(MediaPlayerDevice):
 
     # pylint: disable=too-many-arguments
     def __init__(self, hass, player):
+        self.hass = hass
         super(SonosDevice, self).__init__()
         self._player = player
         self.update()
@@ -78,6 +79,11 @@ class SonosDevice(MediaPlayerDevice):
         """ Returns the name of the device. """
         return self._name
 
+    @property
+    def unique_id(self):
+        """ Returns a unique id. """
+        return "{}.{}".format(self.__class__, self._player.uid)
+
     @property
     def state(self):
         """ Returns the state of the device. """