diff --git a/advanced/hmi/nspanel_eu.HMI b/advanced/hmi/nspanel_eu.HMI
index b9b700c..2d4fc63 100644
Binary files a/advanced/hmi/nspanel_eu.HMI and b/advanced/hmi/nspanel_eu.HMI differ
diff --git a/advanced/hmi/nspanel_us_land.HMI b/advanced/hmi/nspanel_us_land.HMI
index deaa336..e059391 100644
Binary files a/advanced/hmi/nspanel_us_land.HMI and b/advanced/hmi/nspanel_us_land.HMI differ
diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml
index fe349d1..a3c44cb 100644
--- a/nspanel_blueprint.yaml
+++ b/nspanel_blueprint.yaml
@@ -6554,7 +6554,10 @@ condition:
         conditions:
           - '{{ trigger.event is defined and trigger.event.data is defined }}'
           - '{{ trigger.event.data.entity_id is defined }}'
-          - '{{ trigger.event.data.entity_id is match "light." }}'
+          - condition: or
+            conditions:
+              - '{{ trigger.event.data.entity_id is match "light." }}'
+              - '{{ trigger.event.data.entity_id == states(detailed_entity) }}'
       - condition: and
         conditions:
           - '{{ trigger.event is defined and trigger.event.data is defined }}'
@@ -6631,7 +6634,7 @@ condition:
               - current_state_entity31
               - current_state_entity32
       - '{{ page.current in page.buttonpages }}'
-      - '{{ page.current in [page.light, page.cover, page.climate, page.fan, page.alarm] and trigger.entity_id == states(detailed_entity) }}'
+      - '{{ page.current in [page.light, page.cover, page.climate, page.fan, page.alarm] and trigger.entity_id is defined and trigger.entity_id == states(detailed_entity) }}'
 
 #############################################################
 ##### START - Action #####
diff --git a/nspanel_eu.tft b/nspanel_eu.tft
index 255a8f3..5793df6 100644
Binary files a/nspanel_eu.tft and b/nspanel_eu.tft differ
diff --git a/nspanel_us_land.tft b/nspanel_us_land.tft
index d1af0f7..a75b3eb 100644
Binary files a/nspanel_us_land.tft and b/nspanel_us_land.tft differ