diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js
index b61f5ea00..0fcecae3a 100644
--- a/lib/extension/homeassistant.js
+++ b/lib/extension/homeassistant.js
@@ -980,11 +980,11 @@ const mapping = {
     'LVS-SN10ZW_SN11': [cfg.sensor_battery, cfg.binary_sensor_occupancy],
     'B00TN589ZG': [cfg.light_brightness],
     'PSB19-SW27': [cfg.light_brightness],
-    'S1': [cfg.switch],
-    'S2': [switchWithPostfix('l1'), switchWithPostfix('l2')],
+    'S1': [cfg.switch, cfg.sensor_power],
+    'S2': [switchWithPostfix('l1'), switchWithPostfix('l2'), cfg.sensor_power],
     'ZWallRemote0': [cfg.sensor_click],
-    'D1': [cfg.light_brightness],
-    'J1': [cfg.cover_position_tilt],
+    'D1': [cfg.light_brightness, cfg.sensor_power],
+    'J1': [cfg.cover_position_tilt, cfg.sensor_power],
     '73741': [cfg.light_brightness_colortemp_colorxy],
     'ZA806SQ1TCF': [cfg.light_brightness_colortemp],
     'RF 265': [cfg.light_brightness],