diff --git a/src/panels/config/devices/device-detail/ha-device-entities-card.ts b/src/panels/config/devices/device-detail/ha-device-entities-card.ts
index 73364c3969..3b4d461145 100644
--- a/src/panels/config/devices/device-detail/ha-device-entities-card.ts
+++ b/src/panels/config/devices/device-detail/ha-device-entities-card.ts
@@ -199,7 +199,7 @@ export class HaDeviceEntitiesCard extends LitElement {
               ? stripPrefixFromEntityName(
                   name,
                   `${this.deviceName} `.toLowerCase()
-                )
+                ) || name
               : entry.entity_id}
           </div>
         </paper-item-body>