diff --git a/lib/zigbee.js b/lib/zigbee.js
index bd32e2c8..13e40d8f 100644
--- a/lib/zigbee.js
+++ b/lib/zigbee.js
@@ -266,9 +266,8 @@ class Zigbee {
     }
 
     getDeviceFriendlyName(ieeeAddr) {
-        let friendlyName = null;
-        friendlyName = settings.getDevice(ieeeAddr).friendly_name;
-        return (friendlyName ? friendlyName : ieeeAddr);
+        const device = settings.getDevice(ieeeAddr);
+        return device ? device.friendly_name || ieeeAddr : ieeeAddr;
     }
 
     getCoordinator() {