diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml
index 71cbcb2..71fe7de 100644
--- a/nspanel_blueprint.yaml
+++ b/nspanel_blueprint.yaml
@@ -4664,7 +4664,7 @@ action:
                           then:
                             - variables:
                                 ### component_to_update: "{{ repeat.item.button }}"
-                                current_entity_state: "{{ states[repeat.item.entity].state }}"
+                                current_entity_state: "{{ states(repeat.item.entity) }}"
                                 # Button PIC GRAY/WHITE
                                 btn_pic: >-
                                   {%- if current_entity_state == 'unknown' or current_entity_state == 'unavailable' -%} {{ button_off }}
@@ -4915,7 +4915,7 @@ action:
                           then:
                             - variables:
                                 ### component_to_update: "{{ repeat.item.button }}"
-                                current_entity_state: "{{ states[repeat.item.entity].state }}"
+                                current_entity_state: "{{ states(repeat.item.entity) }}"
                                 # Button PIC GRAY/WHITE
                                 btn_pic: >-
                                   {%- if current_entity_state == 'unknown' or current_entity_state == 'unavailable' -%} {{ button_off }}
@@ -5166,7 +5166,7 @@ action:
                           then:
                             - variables:
                                 ### component_to_update: "{{ repeat.item.button }}"
-                                current_entity_state: "{{ states[repeat.item.entity].state }}"
+                                current_entity_state: "{{ states(repeat.item.entity) }}"
                                 # Button PIC GRAY/WHITE
                                 btn_pic: >-
                                   {%- if current_entity_state == 'unknown' or current_entity_state == 'unavailable' -%} {{ button_off }}
@@ -5417,7 +5417,7 @@ action:
                           then:
                             - variables:
                                 ### component_to_update: "{{ repeat.item.button }}"
-                                current_entity_state: "{{ states[repeat.item.entity].state }}"
+                                current_entity_state: "{{ states(repeat.item.entity) }}"
                                 # Button PIC GRAY/WHITE
                                 btn_pic: >-
                                   {%- if current_entity_state == 'unknown' or current_entity_state == 'unavailable' -%} {{ button_off }}