diff --git a/lib/extension/deviceReport.js b/lib/extension/deviceReport.js
index 897f058ca..d1635a917 100644
--- a/lib/extension/deviceReport.js
+++ b/lib/extension/deviceReport.js
@@ -97,7 +97,7 @@ class DeviceReport extends BaseExtension {
     }
 
     shouldSetupReporting(mappedDevice, device, messageType) {
-        if (!device) return false;
+        if (!device || !mappedDevice) return false;
 
         // Handle messages of type endDeviceAnnce and devIncoming.
         // This message is typically send when a device comes online after being powered off