diff --git a/custom_components/ocpp/sensor.py b/custom_components/ocpp/sensor.py
index 536f2b0a..d577ee09 100644
--- a/custom_components/ocpp/sensor.py
+++ b/custom_components/ocpp/sensor.py
@@ -156,6 +156,8 @@ def device_class(self):
             device_class = SensorDeviceClass.CURRENT
         elif self.metric.lower().startswith("voltage"):
             device_class = SensorDeviceClass.VOLTAGE
+        elif self.metric.lower().startswith("energy.r"):
+            device_class = None
         elif self.metric.lower().startswith("energy."):
             device_class = SensorDeviceClass.ENERGY
         elif self.metric in [
@@ -163,8 +165,10 @@ def device_class(self):
             Measurand.rpm,
         ] or self.metric.lower().startswith("frequency"):
             device_class = SensorDeviceClass.FREQUENCY
-        elif self.metric.lower().startswith(("power.a", "power.o", "power.r")):
+        elif self.metric.lower().startswith(("power.a", "power.o")):
             device_class = SensorDeviceClass.POWER
+        elif self.metric.lower().startswith("power.r"):
+            device_class = SensorDeviceClass.REACTIVE_POWER
         elif self.metric.lower().startswith("temperature."):
             device_class = SensorDeviceClass.TEMPERATURE
         elif self.metric.lower().startswith("timestamp.") or self.metric in [