Update entity state when ZHA device becomes available

homeassistant/components/zha/core/device.py

@@ -164,7 +164,7 @@ async def async_configure(self):
         await self._execute_listener_tasks('async_configure')
         _LOGGER.debug('%s: completed configuration', self.name)
 
-    async def async_initialize(self, from_cache):
+    async def async_initialize(self, from_cache=False):
         """Initialize listeners."""
         _LOGGER.debug('%s: started initialization', self.name)
         await self._execute_listener_tasks('async_initialize', from_cache)

homeassistant/components/zha/core/gateway.py

@@ -138,7 +138,7 @@ async def async_device_initialized(self, device, is_new_join):
             ))
         await asyncio.gather(*endpoint_tasks)
 
-        await zha_device.async_initialize(not is_new_join)
+        await zha_device.async_initialize(from_cache=(not is_new_join))
 
         discovery_tasks = []
         for discovery_info in discovery_infos:

homeassistant/components/zha/device_entity.py

@@ -108,13 +108,19 @@ async def async_update(self):
             difference = time.time() - self._zha_device.last_seen
             if difference > self._keepalive_interval:
                 self._zha_device.update_available(False)
-                self._state = None
             else:
                 self._zha_device.update_available(True)
-                self._state = 'online'
                 if self._battery_listener:
                     await self.async_get_latest_battery_reading()
 
+    def async_set_available(self, available):
+        """Set entity availability."""
+        if available:
+            self._state = 'online'
+        else:
+            self._state = 'offline'
+        super().async_set_available(available)
+
     async def _async_init_battery_values(self):
         """Get initial battery level and battery info from listener cache."""
         battery_size = await self._battery_listener.get_attribute_value(