diff --git a/custom_components/myenergi/sensor.py b/custom_components/myenergi/sensor.py
index e2c84ff..93f18b8 100644
--- a/custom_components/myenergi/sensor.py
+++ b/custom_components/myenergi/sensor.py
@@ -306,14 +306,6 @@ async def async_setup_entry(hass, entry, async_add_devices):
 
         # Sensors common to Zapi and Eddi
         if device.kind in [ZAPPI, EDDI]:
-            sensors.append(
-                MyenergiSensor(
-                    coordinator,
-                    device,
-                    entry,
-                    create_meta("Status", "status", None, None, None, "mdi:ev-station"),
-                )
-            )
             sensors.append(
                 MyenergiSensor(
                     coordinator,
@@ -352,6 +344,14 @@ async def async_setup_entry(hass, entry, async_add_devices):
             )
         # Zappi only sensors
         if device.kind == ZAPPI:
+            sensors.append(
+                MyenergiSensor(
+                    coordinator,
+                    device,
+                    entry,
+                    create_meta("Status", "status", None, None, None, "mdi:ev-station"),
+                )
+            )
             sensors.append(
                 MyenergiSensor(
                     coordinator,
@@ -425,6 +425,14 @@ async def async_setup_entry(hass, entry, async_add_devices):
                 )
         elif device.kind == EDDI:
             # Eddi specifc sensors
+            sensors.append(
+                MyenergiSensor(
+                    coordinator,
+                    device,
+                    entry,
+                    create_meta("Status", "status", None, None, None, "mdi:shower"),
+                )
+            )
             sensors.append(
                 MyenergiSensor(
                     coordinator,
@@ -433,6 +441,20 @@ async def async_setup_entry(hass, entry, async_add_devices):
                     create_energy_meta("Energy consumed session", "consumed_session"),
                 )
             )
+            sensors.append(
+                MyenergiSensor(
+                    coordinator,
+                    device,
+                    entry,
+                    create_meta("Active Heater",
+                                "active_heater",
+                                None,
+                                None,
+                                None,
+                                "mdi:fraction-one-half",
+                    ),
+                )
+            )
             if device.temp_1 != -1:
                 sensors.append(
                     MyenergiSensor(