diff --git a/src/mqtt.cpp b/src/mqtt.cpp
index 02ae3a859..e2c588fac 100644
--- a/src/mqtt.cpp
+++ b/src/mqtt.cpp
@@ -1140,10 +1140,10 @@ void Mqtt::add_ha_uom(JsonObject doc, const uint8_t type, const uint8_t uom, con
         } else if (uom == DeviceValueUOM::SECONDS) {
             doc[uom_ha] = "s";
         } else if (uom != DeviceValueUOM::NONE) {
-            // Domoticz use "" for a no-uom
-            if (discovery_type() == discoveryType::HOMEASSISTANT) {
-                doc[uom_ha] = EMSdevice::uom_to_string(uom); // default
-            } 
+            doc[uom_ha] = EMSdevice::uom_to_string(uom); // default
+        } else if (discovery_type() != discoveryType::HOMEASSISTANT) {
+            // Domoticz use " " for a no-uom
+            doc[uom_ha] = " ";
         }
     }