diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js
index 01fa302b..f3950c80 100644
--- a/lib/extension/homeassistant.js
+++ b/lib/extension/homeassistant.js
@@ -905,8 +905,9 @@ class HomeAssistant extends Extension {
     }
 
     async publishDeviceTriggerDiscover(entity, key, value, force=false) {
-        if (entity.settings.hasOwnProperty('homeassistant') &&
-            (entity.settings.homeassistant == null || entity.settings.homeassistant.device_automation == null)) {
+        const haConfig = entity.settings.homeassistant;
+        if (entity.settings.hasOwnProperty('homeassistant') && (haConfig == null ||
+                (haConfig.hasOwnProperty('device_automation') && haConfig.device_automation == null))) {
             return;
         }