diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js
index 2ec6050e7..2d2ee37c9 100644
--- a/lib/extension/homeassistant.js
+++ b/lib/extension/homeassistant.js
@@ -338,15 +338,15 @@ class HomeAssistant extends Extension {
                             soil_moisture: {icon: 'mdi:water-percent'},
                             position: {icon: 'mdi:valve'},
                             pressure: {device_class: 'pressure'},
-                            power: {icon: 'mdi:flash'},
+                            power: {device_class: 'power'},
                             linkquality: {icon: 'mdi:signal'},
-                            current: {icon: 'mdi:current-ac'},
-                            voltage: {icon: 'mdi:alpha-v'},
-                            current_phase_b: {icon: 'mdi:current-ac'},
-                            voltage_phase_b: {icon: 'mdi:alpha-v'},
-                            current_phase_c: {icon: 'mdi:current-ac'},
-                            voltage_phase_c: {icon: 'mdi:alpha-v'},
-                            energy: {icon: 'mdi:power-plug'},
+                            current: {device_class: 'current'},
+                            voltage: {device_class: 'voltage'},
+                            current_phase_b: {device_class: 'current'},
+                            voltage_phase_b: {device_class: 'voltage'},
+                            current_phase_c: {device_class: 'current'},
+                            voltage_phase_c: {device_class: 'voltage'},
+                            energy: {device_class: 'energy'},
                             smoke_density: {icon: 'mdi:google-circles-communities'},
                             gas_density: {icon: 'mdi:google-circles-communities'},
                             pm25: {icon: 'mdi:air-filter'},