diff --git a/esphome/nspanel_esphome_core.yaml b/esphome/nspanel_esphome_core.yaml
index db01649..60d2cd2 100644
--- a/esphome/nspanel_esphome_core.yaml
+++ b/esphome/nspanel_esphome_core.yaml
@@ -1621,7 +1621,15 @@ text_sensor:
     entity_category: diagnostic
     internal: false
     disabled_by_default: false
-    lambda: return {"${name}"};
+    lambda: |-
+      if !(${name_add_mac_suffix}) {
+        return {"${name}"};
+        } else {
+        byte mac[6];
+        WiFi.macAddress(mac);
+        String suffix = String(mac[3],HEX) + String(mac[4],HEX) + String(mac[5],HEX);
+        return {"${name}-" + suffix};
+        }
     filters:
       - lambda: |-
           std::string result;