diff --git a/src/MqttHandleHass.cpp b/src/MqttHandleHass.cpp
index 9d07fe177..0eaed40b7 100644
--- a/src/MqttHandleHass.cpp
+++ b/src/MqttHandleHass.cpp
@@ -113,9 +113,13 @@ void MqttHandleHassClass::publishField(std::shared_ptr<InverterAbstract> inv, ui
         DynamicJsonDocument root(1024);
         root[F("name")] = name;
         root[F("stat_t")] = stateTopic;
-        root[F("unit_of_meas")] = inv->Statistics()->getChannelFieldUnit(channel, fieldType.fieldId);
         root[F("uniq_id")] = serial + "_ch" + String(channel) + "_" + fieldName;
 
+        String unit_of_meausure = inv->Statistics()->getChannelFieldUnit(channel, fieldType.fieldId);
+        if (unit_of_meausure != "") {
+            root[F("unit_of_meas")] = unit_of_meausure;
+        }
+
         JsonObject deviceObj = root.createNestedObject("dev");
         createDeviceInfo(deviceObj, inv);