diff --git a/lib/entity_class/entity.class.dart b/lib/entity_class/entity.class.dart
index e1badd4..309b70c 100644
--- a/lib/entity_class/entity.class.dart
+++ b/lib/entity_class/entity.class.dart
@@ -43,7 +43,7 @@ class Entity {
   );
 
   String get displayName =>
-      attributes["friendly_name"] ?? (attributes["name"] ?? "_");
+      attributes["friendly_name"] ?? (attributes["name"] ?? entityId.split(".")[1].replaceAll("_", " "));
 
   String get deviceClass => attributes["device_class"] ?? null;
   bool get isView =>