From 1d3a577fc49e34374c55acc63521ead49092dd65 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Tue, 21 Jul 2020 20:26:07 +0200
Subject: [PATCH] Fix device incorrectly identified when still interviewing.
 #3947

---
 lib/extension/configure.js | 4 ----
 lib/extension/report.js    | 1 -
 lib/zigbee.js              | 4 ++--
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/extension/configure.js b/lib/extension/configure.js
index 79ebad71..4166288d 100644
--- a/lib/extension/configure.js
+++ b/lib/extension/configure.js
@@ -28,10 +28,6 @@ class Configure extends Extension {
             return false;
         }
 
-        if (resolvedEntity.device.interviewing === true) {
-            return false;
-        }
-
         return true;
     }
 
diff --git a/lib/extension/report.js b/lib/extension/report.js
index 4b7014ef..da944e46 100644
--- a/lib/extension/report.js
+++ b/lib/extension/report.js
@@ -173,7 +173,6 @@ class Report extends Extension {
         // https://github.com/Koenkk/zigbee2mqtt/issues/966
         if (messageType === 'deviceAnnounce' && utils.isIkeaTradfriDevice(device)) return true;
 
-        if (resolvedEntity.device.interviewing === true) return false;
         if (device.meta.hasOwnProperty('reporting') && device.meta.reporting === reportKey) return false;
         if (!utils.isRouter(device) || utils.isBatteryPowered(device)) return false;
         // Gledopto devices don't support reporting.
diff --git a/lib/zigbee.js b/lib/zigbee.js
index e1d81875..0ac62dfc 100644
--- a/lib/zigbee.js
+++ b/lib/zigbee.js
@@ -191,7 +191,7 @@ class Zigbee extends events.EventEmitter {
                     return null;
                 }
 
-                const definition = zigbeeHerdsmanConverters.findByDevice(device);
+                const definition = !device.interviewing ? zigbeeHerdsmanConverters.findByDevice(device) : null;
                 const endpoints = definition && definition.endpoint ? definition.endpoint(device) : null;
                 let endpoint;
                 if (endpointKey) {
@@ -226,7 +226,7 @@ class Zigbee extends events.EventEmitter {
                 endpoint: key.endpoints[0],
                 settings: setting,
                 name: setting ? setting.friendlyName : (key.type === 'Coordinator' ? 'Coordinator' : key.ieeeAddr),
-                definition: zigbeeHerdsmanConverters.findByDevice(key),
+                definition: !key.interviewing ? zigbeeHerdsmanConverters.findByDevice(key) : null,
             };
         } else { // Group
             const setting = settings.getEntity(key.groupID);