diff --git a/src/mqtt/HomeAssistantMqttHandler.cpp b/src/mqtt/HomeAssistantMqttHandler.cpp
index 3987e752..7edd562a 100644
--- a/src/mqtt/HomeAssistantMqttHandler.cpp
+++ b/src/mqtt/HomeAssistantMqttHandler.cpp
@@ -227,7 +227,8 @@ bool HomeAssistantMqttHandler::publishSystem(HwTools* hw) {
                 VERSION,
                 haManuf.c_str(),
                 haUrl.c_str(),
-                strlen_P(HA_STACL[i]) > 0 ? (char *) FPSTR(HA_STACL[i]) : "null"
+                strlen_P(HA_STACL[i]) > 0 ? ", \"stat_cla\" :" : "",
+                strlen_P(HA_STACL[i]) > 0 ? (char *) FPSTR(HA_STACL[i]) : ""
             );
             mqtt->publish(haTopic + haUID + "_" + FPSTR(HA_PARAMS[i]) + "/config", json, true, 0);
         }
diff --git a/web/hadiscover.json b/web/hadiscover.json
index 58e3fd02..0a25d11b 100644
--- a/web/hadiscover.json
+++ b/web/hadiscover.json
@@ -13,6 +13,5 @@
       "sw" : "%s",
       "mf" : "%s",
       "cu" : "%s"
-    },
-    "stat_cla" : %s
+    }%s %s
 }
\ No newline at end of file