diff --git a/config/lovelace/button_card_templates/with_state_indicator_button.yaml b/config/lovelace/button_card_templates/with_state_indicator_button.yaml
index 98f7a3c..a99c184 100644
--- a/config/lovelace/button_card_templates/with_state_indicator_button.yaml
+++ b/config/lovelace/button_card_templates/with_state_indicator_button.yaml
@@ -13,7 +13,7 @@ with_state_indicator:
     action: call-service
     service: homeassistant.toggle
     service_data:
-      entity_id: "[[[ return variables.state_indicator_id || entity ]]]"
+      entity_id: "[[[ return variables.state_indicator_id || entity.entity_id ]]]"
   styles:
     name:
       - transform: "[[[ return 'translateY(' + variables.state_indicator_size + ')' ]]]"