diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml
index 5bfe8a8..c7bc27c 100644
--- a/nspanel_blueprint.yaml
+++ b/nspanel_blueprint.yaml
@@ -6923,6 +6923,7 @@ action:
                                 component: "{{ repeat.item.row }}_label"
                                 message: >-
                                   {%- if repeat.item.entity_name |length > 0 -%} {{ repeat.item.entity_name }}
+                                  {%- elif states(repeat.item.entity) == 'unavailable' -%} {{ repeat.item.entity }}
                                   {%- else -%} {{ state_attr(repeat.item.entity, "friendly_name")| default('no name') }}
                                   {%- endif -%}
                             - service: "{{ command_text_printf }}"
@@ -7002,6 +7003,7 @@ action:
                                 component: "{{ repeat.item.row }}_label"
                                 message: >-
                                   {%- if repeat.item.entity_name |length > 0 -%} {{ repeat.item.entity_name }}
+                                  {%- elif states(repeat.item.entity) == 'unavailable' -%} {{ repeat.item.entity }}
                                   {%- else -%} {{ state_attr(repeat.item.entity, "friendly_name")| default('no name') }}
                                   {%- endif -%}
                             - service: "{{ command_text_printf }}"
@@ -7081,6 +7083,7 @@ action:
                                 component: "{{ repeat.item.row }}_label"
                                 message: >-
                                   {%- if repeat.item.entity_name |length > 0 -%} {{ repeat.item.entity_name }}
+                                  {%- elif states(repeat.item.entity) == 'unavailable' -%} {{ repeat.item.entity }}
                                   {%- else -%} {{ state_attr(repeat.item.entity, "friendly_name")| default('no name') }}
                                   {%- endif -%}
                             - service: "{{ command_text_printf }}"
@@ -7160,6 +7163,7 @@ action:
                                 component: "{{ repeat.item.row }}_label"
                                 message: >-
                                   {%- if repeat.item.entity_name |length > 0 -%} {{ repeat.item.entity_name }}
+                                  {%- elif states(repeat.item.entity) == 'unavailable' -%} {{ repeat.item.entity }}
                                   {%- else -%} {{ state_attr(repeat.item.entity, "friendly_name")| default('no name') }}
                                   {%- endif -%}
                             - service: "{{ command_text_printf }}"