diff --git a/init.hardware.rc b/init.hardware.rc
index ce0af9d3..50f8c27a 100644
--- a/init.hardware.rc
+++ b/init.hardware.rc
@@ -872,3 +872,14 @@ on property:sys.vdso=32
 on property:wlan.driver.status=ok
    # Get the wlan driver/fw version
    start vendor.wlan_sh
+
+# charger driver exposes now finer grain control, map demo mode to those properties
+# demo mode can only be exit wipping data which will also reset the persist properties
+on property:sys.retaildemo.enabled=1
+    setprop persist.vendor.charge.stop.level 35
+    setprop persist.vendor.charge.start.level 30
+
+# system will not set the sys.retaildemo.enabled to 0 but this is used to set back to default charging
+on property:sys.retaildemo.enabled=0
+    setprop persist.vendor.charge.stop.level 100
+    setprop persist.vendor.charge.start.level 0