diff --git a/package.json b/package.json
index ed290ba6..d5e4c620 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
         "winston-transport": "^4.9.0",
         "ws": "^8.21.0",
         "zigbee-herdsman": "10.5.0",
-        "zigbee-herdsman-converters": "26.72.0",
+        "zigbee-herdsman-converters": "26.73.0",
         "zigbee2mqtt-frontend": "0.9.21",
         "zigbee2mqtt-windfront": "2.12.0"
     },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 541aebd5..6d5cd59c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -75,8 +75,8 @@ importers:
         specifier: 10.5.0
         version: 10.5.0
       zigbee-herdsman-converters:
-        specifier: 26.72.0
-        version: 26.72.0
+        specifier: 26.73.0
+        version: 26.73.0
       zigbee2mqtt-frontend:
         specifier: 0.9.21
         version: 0.9.21
@@ -1459,8 +1459,8 @@ packages:
       utf-8-validate:
         optional: true
 
-  zigbee-herdsman-converters@26.72.0:
-    resolution: {integrity: sha512-qNZnyXcI32M9PWTPK2//mQni0HajYsQocrn8xf7L/dUN8nwhctbyGq4YMqR4OiEvN2tWmcERw8sjUD6/cv2oOQ==}
+  zigbee-herdsman-converters@26.73.0:
+    resolution: {integrity: sha512-ewMvfd6G5dA4KanG8V2l8YmNZv1xkdKQ3JX+YQqQw1mVTvqNOAqKcZRopkMaXwhJN6JnDCfdLeEmmN1cNz4Q+g==}
     engines: {node: '>=20.15.0'}
 
   zigbee-herdsman@10.5.0:
@@ -2740,7 +2740,7 @@ snapshots:
 
   ws@8.21.0: {}
 
-  zigbee-herdsman-converters@26.72.0:
+  zigbee-herdsman-converters@26.73.0:
     dependencies:
       iconv-lite: 0.7.2
       semver: 7.8.5
diff --git a/test/extensions/homeassistant.test.ts b/test/extensions/homeassistant.test.ts
index d0719fdd..9e0d09bc 100644
--- a/test/extensions/homeassistant.test.ts
+++ b/test/extensions/homeassistant.test.ts
@@ -1397,11 +1397,11 @@ describe("Extension: HomeAssistant", () => {
             min_temp: "5",
             mode_command_topic: "zigbee2mqtt/bosch_rm230z/set",
             mode_state_template:
-                "{% set values = {'schedule':'auto','manual':'heat','pause':'off'} %}{% set value = value_json.operating_mode %}{% if value == \"manual\" %}{{ value_json.system_mode }}{% else %}{{ values[value] if value in values.keys() else 'off' }}{% endif %}",
+                "{% set active_modes = ['heat'] %}{% set fallback_mode = 'heat' %}{% set values = {'schedule':'auto','pause':'off'} %}{% set value = value_json.operating_mode %}{% set mode = value_json.system_mode %}{% if value == 'manual' %}{{ mode if mode in active_modes else fallback_mode }}{% else %}{{ values[value] if value in values.keys() else 'off' }}{% endif %}",
             mode_command_template:
-                "{% set values = { 'auto':'schedule','heat':'manual','cool':'manual','off':'pause'} %}{% if value == \"heat\" or value == \"cool\" %}{\"operating_mode\": \"manual\", \"system_mode\": \"{{ value }}\"}{% else %}{\"operating_mode\": \"{{ values[value] if value in values.keys() else 'pause' }}\"}{% endif %}",
+                "{% set active_modes = ['heat'] %}{% set values = {'auto':'schedule','off':'pause'} %}{% if value in active_modes %}{\"operating_mode\": \"manual\", \"system_mode\": \"{{ value }}\"}{% else %}{\"operating_mode\": \"{{ values[value] if value in values.keys() else 'pause' }}\"}{% endif %}",
             mode_state_topic: "zigbee2mqtt/bosch_rm230z",
-            modes: ["off", "heat", "cool", "auto"],
+            modes: ["off", "heat", "auto"],
             name: null,
             object_id: "bosch_rm230z",
             origin,