diff --git a/conf/init.zuma.rc b/conf/init.zuma.rc
index 43e4759a..30b3e433 100644
--- a/conf/init.zuma.rc
+++ b/conf/init.zuma.rc
@@ -292,6 +292,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
+    # Enable charger mode (aka off-mode charging) by default
+    chown system system /sys/class/power_supply/battery/charger_mode
+    write /sys/class/power_supply/battery/charger_mode 1
 
     # Power Stats HAL
     chown system system /dev/bbd_pwrstat
@@ -836,6 +839,14 @@ on  property:persist.sys.test_harness=1 && property:persist.vendor.testing_batte
     setprop persist.vendor.charge.start.level 0
     setprop vendor.battery.defender.disable 1
 
+# Clear the state of charger_mode
+on property:persist.vendor.charger_mode.enable=1
+    write /sys/class/power_supply/battery/charger_mode 0
+
+# Enable charger_mode when user triggers shutdown from menu
+on property:sys.shutdown.requested=0userrequested
+    write /sys/class/power_supply/battery/charger_mode 1
+
 service init_display /vendor/bin/init.display.sh
     class main
     user root