diff --git a/src/mqtt/HomeAssistantMqttHandler.cpp b/src/mqtt/HomeAssistantMqttHandler.cpp
index db5f4d8b..823923ca 100644
--- a/src/mqtt/HomeAssistantMqttHandler.cpp
+++ b/src/mqtt/HomeAssistantMqttHandler.cpp
@@ -219,7 +219,7 @@ bool HomeAssistantMqttHandler::publishSystem(HwTools* hw) {
                 haUID, FPSTR(HA_PARAMS[i]),
                 haUID, FPSTR(HA_PARAMS[i]),
                 FPSTR(HA_UOM[i]),
-                FPSTR(HA_PARAMS[i]),
+                FPSTR(HA_PARAMS[i]), FPSTR(HA_PARAMS[i]), haUID, FPSTR(HA_PARAMS[i]),
                 FPSTR(HA_DEVCL[i]),
                 haUID.c_str(),
                 haName.c_str(),
diff --git a/web/hadiscover.json b/web/hadiscover.json
index 7b7dfdc9..58e3fd02 100644
--- a/web/hadiscover.json
+++ b/web/hadiscover.json
@@ -4,7 +4,7 @@
     "uniq_id" : "%s_%s",
     "obj_id" : "%s_%s",
     "unit_of_meas" : "%s",
-    "val_tpl" : "{{value_json['%s']}}",
+    "val_tpl" : "{%% if value_json.%s is defined %%} {{ value_json.%s }} {%% else %%} {{(states.sensor.%s_%s|float)}} {%% endif %%}",
     "dev_cla" : "%s",
     "dev" : {
       "ids" : [ "%s" ],