diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js
index 9e603d600..b6cc5ee3e 100644
--- a/lib/extension/homeassistant.js
+++ b/lib/extension/homeassistant.js
@@ -2177,7 +2177,7 @@ class HomeAssistant extends Extension {
         // Check if already discoverd and check if there are configs.
         const {device, definition} = resolvedEntity;
         const discover = force || !this.discovered[device.ieeeAddr];
-        if (!discover || !device || !definition || !mapping[definition.model] ||
+        if (!discover || !device || !definition || !mapping[definition.model] || device.interviewing ||
             (resolvedEntity.settings.hasOwnProperty('homeassistant') && !resolvedEntity.settings.homeassistant)) {
             return;
         }