diff --git a/custom_components/aquarea/definitions.py b/custom_components/aquarea/definitions.py
index 488d269..8ee35c0 100644
--- a/custom_components/aquarea/definitions.py
+++ b/custom_components/aquarea/definitions.py
@@ -1237,11 +1237,13 @@ def build_sensors(mqtt_prefix: str) -> list[HeishaMonSensorEntityDescription]:
             heishamon_topic_id="TOP95",
             key=f"{mqtt_prefix}main/Max_Pump_Duty",
             name="Aquarea Max pump duty configured",
+            native_unit_of_measurement="Count",
         ),
         HeishaMonSensorEntityDescription(
             heishamon_topic_id="TOP93",
             key=f"{mqtt_prefix}main/Pump_Duty",
             name="Aquarea Pump Duty",
+            native_unit_of_measurement="Count",
         ),
         HeishaMonSensorEntityDescription(
             heishamon_topic_id="TOP101",
diff --git a/custom_components/aquarea/sensor.py b/custom_components/aquarea/sensor.py
index 5ace4b5..60d127f 100644
--- a/custom_components/aquarea/sensor.py
+++ b/custom_components/aquarea/sensor.py
@@ -263,6 +263,7 @@ def message_received(message):
                     name=f"HeishaMon s0 {device_id} WattHour",
                     device_class=SensorDeviceClass.ENERGY,
                     state_class=SensorStateClass.MEASUREMENT,
+                    unit_of_measurement="kWh",
                     native_unit_of_measurement="Wh",
                     device=DeviceType.HEISHAMON,
                 )
@@ -274,6 +275,7 @@ def message_received(message):
                     key="/".join([base, s0, "WatthourTotal", device_id]),
                     name=f"HeishaMon s0 {device_id} WattHourTotal",
                     device_class=SensorDeviceClass.ENERGY,
+                    unit_of_measurement="kWh",
                     native_unit_of_measurement="Wh",
                     state_class=SensorStateClass.TOTAL_INCREASING,
                     device=DeviceType.HEISHAMON,