diff --git a/conf/init.zumapro.rc b/conf/init.zumapro.rc
index f98a815..1bc3bd4 100644
--- a/conf/init.zumapro.rc
+++ b/conf/init.zumapro.rc
@@ -974,3 +974,5 @@ on post-fs-data && property:ro.vendor.factory=1
 on property:ro.boot.mode=charger && property:init.svc.vendor.charger=running
     # Enable UFS powersaving in Off Mode Charger
     write /dev/sys/block/bootdevice/clkgate_enable 1
+    # Disable dock-defend in Off Mode Charger
+    write /sys/devices/platform/google,charger/dd_state -1
diff --git a/dumpstate/dump_power.rc b/dumpstate/dump_power.rc
index a3fc8fb..aba3a75 100644
--- a/dumpstate/dump_power.rc
+++ b/dumpstate/dump_power.rc
@@ -72,6 +72,9 @@ on init
     chown system system /sys/devices/platform/google,charger/charge_start_level
     chown system system /sys/devices/platform/google,charger/charge_stop_level
     chown system system /sys/devices/platform/google,cpm/dc_ctl
+    # Important to include dd_state as it's used in battery defender in charger mode
+    chown system system /sys/devices/platform/google,charger/dd_state
+    chown system system /sys/devices/platform/google,charger/dd_settings
 
 on early-boot
     # Wait for insmod_sh to finish all common modules