diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml
index dd1b88a..37a24d4 100644
--- a/nspanel_blueprint.yaml
+++ b/nspanel_blueprint.yaml
@@ -5184,7 +5184,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 }}
@@ -5435,7 +5435,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 }}
@@ -5686,7 +5686,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 }}
@@ -5937,7 +5937,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 }}