diff --git a/lib/controller.js b/lib/controller.js
index 8fb9ce77e..e26e8888a 100644
--- a/lib/controller.js
+++ b/lib/controller.js
@@ -36,7 +36,9 @@ class Controller {
         if (settings.get().homeassistant) {
             // MQTT discovery of all paired devices on startup.
             this.zigbee.getAllClients().forEach((device) => {
-                homeassistant.discover(device.ieeeAddr, deviceMapping[device.modelId].homeassistant, this.mqtt);
+                if (deviceMapping[device.modelId]) {
+                    homeassistant.discover(device.ieeeAddr, deviceMapping[device.modelId].homeassistant, this.mqtt);
+                }
             });
         }