diff --git a/lib/extension/homeassistant.ts b/lib/extension/homeassistant.ts
index 753249346..44d5c0d8e 100644
--- a/lib/extension/homeassistant.ts
+++ b/lib/extension/homeassistant.ts
@@ -261,7 +261,7 @@ export default class HomeAssistant extends Extension {
                 discoveryEntry.mockProperties.push({property: state.property, value: null});
                 discoveryEntry.discovery_payload.action_topic = true;
                 discoveryEntry.discovery_payload.action_template = `{% set values = ` +
-                        `{None:None,'idle':'off','heat':'heating','cool':'cooling','fan_only':'fan'}` +
+                        `{None:None,'idle':'idle','heat':'heating','cool':'cooling','fan_only':'fan'}` +
                         ` %}{{ values[value_json.${state.property}] }}`;
             }
 
diff --git a/test/homeassistant.test.js b/test/homeassistant.test.js
index 06f7dbc6f..8b3e266f6 100644
--- a/test/homeassistant.test.js
+++ b/test/homeassistant.test.js
@@ -785,7 +785,7 @@ describe('HomeAssistant extension', () => {
         let payload;
 
         payload = {
-            "action_template":"{% set values = {None:None,'idle':'off','heat':'heating','cool':'cooling','fan_only':'fan'} %}{{ values[value_json.running_state] }}",
+            "action_template":"{% set values = {None:None,'idle':'idle','heat':'heating','cool':'cooling','fan_only':'fan'} %}{{ values[value_json.running_state] }}",
             "action_topic":"zigbee2mqtt/TS0601_thermostat",
             "availability":[
                 {