diff --git a/lib/zigbee.ts b/lib/zigbee.ts
index 499520f79..22a5b0ce2 100644
--- a/lib/zigbee.ts
+++ b/lib/zigbee.ts
@@ -290,7 +290,7 @@ export default class Zigbee {
 
     deviceByNetworkAddress(networkAddress: number): Device {
         const device = this.herdsman.getDeviceByNetworkAddress(networkAddress);
-        return this.addDeviceToResolvedEntitiesLookup(device.ieeeAddr);
+        return device && this.addDeviceToResolvedEntitiesLookup(device.ieeeAddr);
     }
 
     // TODO remove all legacy below