diff --git a/package.json b/package.json
index 502578401..2caa074ca 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
         "winston-transport": "^4.9.0",
         "ws": "^8.22.0",
         "zigbee-herdsman": "11.0.2",
-        "zigbee-herdsman-converters": "26.117.1",
+        "zigbee-herdsman-converters": "26.118.0",
         "zigbee2mqtt-frontend": "0.9.21",
         "zigbee2mqtt-windfront": "2.15.0"
     },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0897b46ae..77734b0a7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -57,8 +57,8 @@ importers:
         specifier: 11.0.2
         version: 11.0.2(supports-color@7.2.0)
       zigbee-herdsman-converters:
-        specifier: 26.117.1
-        version: 26.117.1(supports-color@7.2.0)
+        specifier: 26.118.0
+        version: 26.118.0(supports-color@7.2.0)
       zigbee2mqtt-frontend:
         specifier: 0.9.21
         version: 0.9.21
@@ -1275,8 +1275,8 @@ packages:
       utf-8-validate:
         optional: true
 
-  zigbee-herdsman-converters@26.117.1:
-    resolution: {integrity: sha512-RdWs56XtRxBS2WBuL1C90JMe6OolLgLjDsZFfPckXElg6eZikPxXmiAVtJCtUHRWcZ6wnu4qlJz1Co0hnutznw==}
+  zigbee-herdsman-converters@26.118.0:
+    resolution: {integrity: sha512-BUwWsdGjzp0aNeSE3ha/1iCQqu/rBZYUIx8exf7UIvvx1nJ8M9hg5LuCNQQITkL68WI9rwRO1NREiM6n68FmQA==}
     engines: {node: ^22.2.0 || ^24 || <=26.2}
 
   zigbee-herdsman@11.0.2:
@@ -2266,7 +2266,7 @@ snapshots:
 
   ws@8.22.0: {}
 
-  zigbee-herdsman-converters@26.117.1(supports-color@7.2.0):
+  zigbee-herdsman-converters@26.118.0(supports-color@7.2.0):
     dependencies:
       iconv-lite: 0.7.3
       semver: 7.8.5
diff --git a/test/extensions/homeassistant.test.ts b/test/extensions/homeassistant.test.ts
index a96a20a3d..b1b7f9da3 100644
--- a/test/extensions/homeassistant.test.ts
+++ b/test/extensions/homeassistant.test.ts
@@ -1745,9 +1745,13 @@ describe("Extension: HomeAssistant", () => {
         const climateL1 = configs.find((c) => c.type === "climate" && c.object_id === "climate_l1");
         const climateL2 = configs.find((c) => c.type === "climate" && c.object_id === "climate_l2");
         // Same endpoint humidity is preferred
-        expect(climateL1!.discovery_payload.current_humidity_template).toStrictEqual('{{ value_json["humidity_l1"] }}');
+        expect(climateL1!.discovery_payload.current_humidity_template).toStrictEqual(
+            '{% if "humidity_l1" in value_json %}{{ value_json["humidity_l1"] }}{% endif %}',
+        );
         // Falls back to humidity without endpoint
-        expect(climateL2!.discovery_payload.current_humidity_template).toStrictEqual('{{ value_json["humidity"] }}');
+        expect(climateL2!.discovery_payload.current_humidity_template).toStrictEqual(
+            '{% if "humidity" in value_json %}{{ value_json["humidity"] }}{% endif %}',
+        );
     });
 
     it("Should discover climate with cooling-only setpoint", () => {