diff --git a/plugins/sources/SHM2/shm2.py b/plugins/sources/SHM2/shm2.py
index 470ab79..a073062 100644
--- a/plugins/sources/SHM2/shm2.py
+++ b/plugins/sources/SHM2/shm2.py
@@ -205,7 +205,7 @@ def execute(config, add_data, dostop):
         'enabled': "true",
         'name': "Reactive power consumption",
         'device_class': "reactive_power",
-        'unit_of_measurement': "W",
+        'unit_of_measurement': "var",
         'state_class': "measurement",
         'suggested_display_precision': 2,
         'icon': "mdi:home-lightning-bolt-outline",
@@ -214,8 +214,8 @@ def execute(config, add_data, dostop):
         'key': "q.qconsumecounter",
         'enabled': "true",
         'name': "Reactive power consumption counter",
-        'device_class': "energy",
-        'unit_of_measurement': "kWh",
+        'device_class': "reactive_energy",
+        'unit_of_measurement': "kvarh",
         'suggested_display_precision': 2,
         'icon': "mdi:counter",
     },
@@ -224,7 +224,7 @@ def execute(config, add_data, dostop):
         'enabled': "true",
         'name': "Reactive power supply",
         'device_class': "reactive_power",
-        'unit_of_measurement': "W",
+        'unit_of_measurement': "var",
         'state_class': "measurement",
         'suggested_display_precision': 2,
         'icon': "mdi:home-lightning-bolt-outline",
@@ -233,8 +233,8 @@ def execute(config, add_data, dostop):
         'key': "q.qsupplycounter",
         'enabled': "true",
         'name': "Reactive power supply counter",
-        'device_class': "energy",
-        'unit_of_measurement': "kWh",
+        'device_class': "reactive_energy",
+        'unit_of_measurement': "kvarh",
         'state_class': "total_increasing",
         'suggested_display_precision': 2,
         'icon': "mdi:counter",
@@ -344,7 +344,7 @@ def execute(config, add_data, dostop):
         'enabled': "false",
         'name': "Phase 1 reactive power consumption",
         'device_class': "reactive_power",
-        'unit_of_measurement': "W",
+        'unit_of_measurement': "var",
         'state_class': "measurement",
         'suggested_display_precision': 2,
         'icon': "mdi:home-lightning-bolt-outline",
@@ -353,8 +353,8 @@ def execute(config, add_data, dostop):
         'key': "q.1.q1consumecounter",
         'enabled': "false",
         'name': "Phase 1 reactive power consumption counter",
-        'device_class': "energy",
-        'unit_of_measurement': "kWh",
+        'device_class': "reactive_energy",
+        'unit_of_measurement': "kvarh",
         'state_class': "total_increasing",
         'suggested_display_precision': 2,
         'icon': "mdi:counter",
@@ -364,7 +364,7 @@ def execute(config, add_data, dostop):
         'enabled': "false",
         'name': "Phase 1 reactive power supply",
         'device_class': "reactive_power",
-        'unit_of_measurement': "W",
+        'unit_of_measurement': "var",
         'state_class': "measurement",
         'suggested_display_precision': 2,
         'icon': "mdi:home-lightning-bolt-outline",
@@ -373,8 +373,8 @@ def execute(config, add_data, dostop):
         'key': "q.1.q1supplycounter",
         'enabled': "false",
         'name': "Phase 1 reactive power supply counter",
-        'device_class': "energy",
-        'unit_of_measurement': "kWh",
+        'device_class': "reactive_energy",
+        'unit_of_measurement': "kvarh",
         'state_class': "total_increasing",
         'suggested_display_precision': 2,
         'icon': "mdi:counter",
@@ -494,7 +494,7 @@ def execute(config, add_data, dostop):
         'enabled': "false",
         'name': "Phase 2 reactive power consumption",
         'device_class': "reactive_power",
-        'unit_of_measurement': "W",
+        'unit_of_measurement': "var",
         'state_class': "measurement",
         'suggested_display_precision': 2,
         'icon': "mdi:home-lightning-bolt-outline",
@@ -503,8 +503,8 @@ def execute(config, add_data, dostop):
         'key': "q.2.q2consumecounter",
         'enabled': "false",
         'name': "Phase 2 reactive power consumption counter",
-        'device_class': "energy",
-        'unit_of_measurement': "kWh",
+        'device_class': "reactive_energy",
+        'unit_of_measurement': "kvarh",
         'state_class': "total_increasing",
         'suggested_display_precision': 2,
         'icon': "mdi:counter",
@@ -514,7 +514,7 @@ def execute(config, add_data, dostop):
         'enabled': "false",
         'name': "Phase 2 reactive power supply",
         'device_class': "reactive_power",
-        'unit_of_measurement': "W",
+        'unit_of_measurement': "var",
         'state_class': "measurement",
         'suggested_display_precision': 2,
         'icon': "mdi:home-lightning-bolt-outline",
@@ -523,8 +523,8 @@ def execute(config, add_data, dostop):
         'key': "q.2.q2supplycounter",
         'enabled': "false",
         'name': "Phase 2 reactive power supply counter",
-        'device_class': "energy",
-        'unit_of_measurement': "kWh",
+        'device_class': "reactive_energy",
+        'unit_of_measurement': "kvarh",
         'state_class': "total_increasing",
         'suggested_display_precision': 2,
         'icon': "mdi:counter",
@@ -644,7 +644,7 @@ def execute(config, add_data, dostop):
         'enabled': "false",
         'name': "Phase 3 reactive power consumption",
         'device_class': "reactive_power",
-        'unit_of_measurement': "W",
+        'unit_of_measurement': "var",
         'state_class': "measurement",
         'suggested_display_precision': 2,
         'icon': "mdi:home-lightning-bolt-outline",
@@ -653,8 +653,8 @@ def execute(config, add_data, dostop):
         'key': "q.3.q3consumecounter",
         'enabled': "false",
         'name': "Phase 3 reactive power consumption counter",
-        'device_class': "energy",
-        'unit_of_measurement': "kWh",
+        'device_class': "reactive_energy",
+        'unit_of_measurement': "kvarh",
         'state_class': "total_increasing",
         'suggested_display_precision': 2,
         'icon': "mdi:counter",
@@ -664,7 +664,7 @@ def execute(config, add_data, dostop):
         'enabled': "false",
         'name': "Phase 3 reactive power supply",
         'device_class': "reactive_power",
-        'unit_of_measurement': "W",
+        'unit_of_measurement': "var",
         'state_class': "measurement",
         'suggested_display_precision': 2,
         'icon': "mdi:home-lightning-bolt-outline",
@@ -673,8 +673,8 @@ def execute(config, add_data, dostop):
         'key': "q.3.q3supplycounter",
         'enabled': "false",
         'name': "Phase 3 reactive power supply counter",
-        'device_class': "energy",
-        'unit_of_measurement': "kWh",
+        'device_class': "reactive_energy",
+        'unit_of_measurement': "kvarh",
         'state_class': "total_increasing",
         'suggested_display_precision': 2,
         'icon': "mdi:counter",
diff --git a/pyproject.toml b/pyproject.toml
index 8d66655..cfad11c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ requires = ["flit_core >=3.8.0,<4"]
 
 [project]
 name = "smahub"
-version = "1.7.2"
+version = "1.7.3"
 authors = [{ name = "Daniel Krippner", email = "dk.mailbox@gmx.net" }]
 description = "Little daemon that runs plugins for collecting data from SMA PV products, and publishes to eg MQTT via other plugins."
 readme = "README.md"