diff --git a/homeassistant/components/zha/entity.py b/homeassistant/components/zha/entity.py
index 6fd68056025..0ba75a99306 100644
--- a/homeassistant/components/zha/entity.py
+++ b/homeassistant/components/zha/entity.py
@@ -92,14 +92,14 @@ class BaseZhaEntity(LogMixin, entity.Entity):
         """Return a device description for device registry."""
         zha_device_info = self._zha_device.device_info
         ieee = zha_device_info["ieee"]
-        return {
-            "connections": {(CONNECTION_ZIGBEE, ieee)},
-            "identifiers": {(DOMAIN, ieee)},
-            ATTR_MANUFACTURER: zha_device_info[ATTR_MANUFACTURER],
-            ATTR_MODEL: zha_device_info[ATTR_MODEL],
-            ATTR_NAME: zha_device_info[ATTR_NAME],
-            "via_device": (DOMAIN, self.hass.data[DATA_ZHA][DATA_ZHA_BRIDGE_ID]),
-        }
+        return entity.DeviceInfo(
+            connections={(CONNECTION_ZIGBEE, ieee)},
+            identifiers={(DOMAIN, ieee)},
+            manufacturer=zha_device_info[ATTR_MANUFACTURER],
+            model=zha_device_info[ATTR_MODEL],
+            name=zha_device_info[ATTR_NAME],
+            via_device=(DOMAIN, self.hass.data[DATA_ZHA][DATA_ZHA_BRIDGE_ID]),
+        )
 
     @callback
     def async_state_changed(self) -> None: