diff --git a/homeassistant/components/yeelight/__init__.py b/homeassistant/components/yeelight/__init__.py
index 7a14a4d1842..dc79e9357ff 100644
--- a/homeassistant/components/yeelight/__init__.py
+++ b/homeassistant/components/yeelight/__init__.py
@@ -22,7 +22,7 @@ _LOGGER = logging.getLogger(__name__)
 
 DOMAIN = "yeelight"
 DATA_YEELIGHT = DOMAIN
-DATA_UPDATED = '{}_data_updated'.format(DOMAIN)
+DATA_UPDATED = 'yeelight_{}_data_updated'
 
 DEFAULT_NAME = 'Yeelight'
 DEFAULT_TRANSITION = 350
@@ -274,4 +274,4 @@ class YeelightDevice:
                 _LOGGER.error("Unable to update bulb status: %s", ex)
             self._available = False
 
-        dispatcher_send(self._hass, DATA_UPDATED, self._ipaddr)
+        dispatcher_send(self._hass, DATA_UPDATED.format(self._ipaddr))
diff --git a/homeassistant/components/yeelight/binary_sensor.py b/homeassistant/components/yeelight/binary_sensor.py
index d39af08f768..0b44966f15c 100644
--- a/homeassistant/components/yeelight/binary_sensor.py
+++ b/homeassistant/components/yeelight/binary_sensor.py
@@ -31,14 +31,15 @@ class YeelightNightlightModeSensor(BinarySensorDevice):
         self._device = device
 
     @callback
-    def _schedule_immediate_update(self, ipaddr):
-        if ipaddr == self._device.ipaddr:
-            self.async_schedule_update_ha_state()
+    def _schedule_immediate_update(self):
+        self.async_schedule_update_ha_state()
 
     async def async_added_to_hass(self):
         """Handle entity which will be added."""
         async_dispatcher_connect(
-            self.hass, DATA_UPDATED, self._schedule_immediate_update
+            self.hass,
+            DATA_UPDATED.format(self._device.ipaddr),
+            self._schedule_immediate_update
         )
 
     @property
diff --git a/homeassistant/components/yeelight/light.py b/homeassistant/components/yeelight/light.py
index 74796a524b0..8aa5c3d7300 100644
--- a/homeassistant/components/yeelight/light.py
+++ b/homeassistant/components/yeelight/light.py
@@ -212,14 +212,15 @@ class YeelightLight(Light):
             self._custom_effects = {}
 
     @callback
-    def _schedule_immediate_update(self, ipaddr):
-        if ipaddr == self.device.ipaddr:
-            self.async_schedule_update_ha_state(True)
+    def _schedule_immediate_update(self):
+        self.async_schedule_update_ha_state(True)
 
     async def async_added_to_hass(self):
         """Handle entity which will be added."""
         async_dispatcher_connect(
-            self.hass, DATA_UPDATED, self._schedule_immediate_update
+            self.hass,
+            DATA_UPDATED.format(self._device.ipaddr),
+            self._schedule_immediate_update
         )
 
     @property