diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js
index 33b7778f..cea5ddb5 100755
--- a/lib/extension/homeassistant.js
+++ b/lib/extension/homeassistant.js
@@ -605,7 +605,7 @@ const mapping = {
     '421786': [cfg.light_brightness],
     'ICZB-IW11D': [cfg.light_brightness],
     '3321-S': [cfg.binary_sensor_contact, cfg.sensor_temperature],
-    'ZPIR-8000': [cfg.binary_sensor_occupancy],
+    'ZPIR-8000': [cfg.binary_sensor_occupancy, cfg.sensor_battery],
     'ZCTS-808': [cfg.binary_sensor_contact, cfg.sensor_battery],
     'ZNLDP12LM': [cfg.light_brightness_colortemp],
     'D1821': [cfg.light_brightness_colortemp_colorxy],
@@ -960,7 +960,7 @@ const mapping = {
     'ZNCLDJ12LM': [cfg.cover_position],
     '046677552343': [cfg.switch],
     '3115331PH': [cfg.light_brightness_colortemp_colorxy],
-    'ZWLD-100': [cfg.binary_sensor_water_leak, cfg.binary_sensor_battery_low],
+    'ZWLD-100': [cfg.binary_sensor_water_leak, cfg.binary_sensor_battery_low, cfg.sensor_battery],
     'GL-MC-001': [cfg.light_brightness_colortemp_colorxy],
     'YRD226/246 TSDB': [cfg.lock, cfg.sensor_battery],
     'T1820': [cfg.light_brightness_colortemp],