diff --git a/zabbix_scripts/disco_unifi b/zabbix_scripts/disco_unifi
index 3471df6..e84a66c 100755
--- a/zabbix_scripts/disco_unifi
+++ b/zabbix_scripts/disco_unifi
@@ -80,7 +80,7 @@ if ($what eq 'devices'){
       '{#UNIFI_DEV_ID}'      => $entry->{device_id},
       '{#UNIFI_DEV_ADOPTED}' => $entry->{adopted},
       '{#UNIFI_DEV_MODEL}'   => $entry->{model},
-      '{#UNIFI_DEV_NAME}'    => $entry->{name},
+      '{#UNIFI_DEV_NAME}'    => $entry->{name} || $entry->{mac},
       '{#UNIFI_DEV_MAC}'     => $entry->{mac},
       '{#UNIFI_DEV_TYPE}'    => $entry->{type}
     };