diff --git a/common/params.py b/common/params.py
index 776e3b337..a6dd855eb 100755
--- a/common/params.py
+++ b/common/params.py
@@ -118,6 +118,7 @@ keys = {
   "DragonSteeringMonitorTimer": [TxType.PERSISTENT],
   "DragonCameraOffset": [TxType.PERSISTENT],
   "DragonUIVolumeBoost": [TxType.PERSISTENT],
+  "DragonChargingCtrl": [TxType.PERSISTENT],
 }
 
 
diff --git a/selfdrive/dragonpilot/dragonconf/__init__.py b/selfdrive/dragonpilot/dragonconf/__init__.py
index b8efbd4a2..81d72095e 100644
--- a/selfdrive/dragonpilot/dragonconf/__init__.py
+++ b/selfdrive/dragonpilot/dragonconf/__init__.py
@@ -38,6 +38,7 @@ default_conf = {
   'DragonSteeringMonitorTimer': '3',
   'DragonCameraOffset': '6',
   'DragonUIVolumeBoost': '0',
+  'DragonChargingCtrl': '0',
 }
 
 deprecated_conf = {
diff --git a/selfdrive/thermald.py b/selfdrive/thermald.py
index a087d670f..78bef3118 100755
--- a/selfdrive/thermald.py
+++ b/selfdrive/thermald.py
@@ -257,6 +257,8 @@ def thermald_thread():
         os.system('LD_LIBRARY_PATH="" svc power shutdown')
 
     #charging_disabled = check_car_battery_voltage(should_start, health, charging_disabled)
+    if count % 3 == 0 and params.get('DragonChargingCtrl') == "1":
+      charging_disabled = charging_ctrl(msg.thermal.batteryPercent, charging_disabled)
 
     msg.thermal.chargingDisabled = charging_disabled
     msg.thermal.chargingError = current_filter.x > 0. and msg.thermal.batteryPercent < 90  # if current is positive, then battery is being discharged
@@ -277,6 +279,14 @@ def thermald_thread():
 
     count += 1
 
+def charging_ctrl(battery_percent, charging_disabled):
+  if not charging_disabled and battery_percent >= 80:
+    os.system('echo "0" > /sys/class/power_supply/battery/charging_enabled')
+    return True
+  elif charging_disabled and battery_percent <= 60:
+    os.system('echo "1" > /sys/class/power_supply/battery/charging_enabled')
+    return False
+
 
 def main(gctx=None):
   thermald_thread()