diff --git a/hue_dimmer_zigbee2mqtt.yaml b/hue_dimmer_zigbee2mqtt.yaml
index 983621b..a0f4c7d 100644
--- a/hue_dimmer_zigbee2mqtt.yaml
+++ b/hue_dimmer_zigbee2mqtt.yaml
@@ -76,7 +76,13 @@ action:
           - service: mqtt.publish
             data:
               topic: "{{ target_topic }}"
-              payload: '{"state":"OFF"}'
+              payload: '{ "brightness": 0 }'
+              qos: 0
+              retain: false
+          - service: mqtt.publish
+            data:
+              topic: "{{ target_topic }}"
+              payload: '{ "state":"OFF" }'
               qos: 0
               retain: false
       - conditions:
@@ -86,7 +92,13 @@ action:
           - service: mqtt.publish
             data:
               topic: "{{ target_topic }}"
-              payload: '{"brightness_move": {{ move_rate }}}'
+              payload: '{ "state": "ON" }'
+              qos: 0
+              retain: false
+          - service: mqtt.publish
+            data:
+              topic: "{{ target_topic }}"
+              payload: '{ "brightness_move": {{ move_rate }} }'
               qos: 0
               retain: false
       - conditions: