diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js
index 7f1cdb423..4d0b54b85 100644
--- a/lib/extension/homeassistant.js
+++ b/lib/extension/homeassistant.js
@@ -1817,7 +1817,7 @@ class HomeAssistant extends Extension {
     discover(resolvedEntity, force=false) {
         // Check if already discoverd and check if there are configs.
         const {device, definition} = resolvedEntity;
-        const deviceSettings = resolvedEntity.settings;
+        const deviceSettings = {...settings.get().device_options, ...resolvedEntity.settings};
         const discover = force || !this.discovered[device.ieeeAddr];
         if (!discover || !device || !definition || !mapping[definition.model] || !deviceSettings ||
             (deviceSettings.hasOwnProperty('homeassistant') && !deviceSettings.homeassistant)) {