diff --git a/core/app_scenario.py b/core/app_scenario.py
index a06bd2d..68ec272 100644
--- a/core/app_scenario.py
+++ b/core/app_scenario.py
@@ -387,6 +387,7 @@ def cleanup():
         self.trigger_soc = Params.get('global', 'trigger_soc')
         self.trigger_script = Params.get('global', 'trigger_script')
         self.rundown_mode = Params.get('global', 'rundown_mode')
+        self.rundown_quick_charge_on = Params.get('global', 'rundown_quick_charge_on')
         self.poll_rate = "360" # 6 minutes, gives us battery life hours in 0.1 increments.
 
     def _record_phase_time(self, phase_name, start_time, duration):
@@ -1013,6 +1014,14 @@ def runWithThreads(self):
             logging.debug("waiting for threads to end")
             endThreadEvent.wait()
 
+            # Check if we want to flip back charger immedialtely after a thread ends
+            if self.rundown_quick_charge_on == "1":
+                charge_on_call = Params.get('global', 'charge_on_call')
+                if charge_on_call == '':      
+                    logging.warning("No charge_on_call specified.")             
+                else:
+                    self._host_call(charge_on_call)    
+                    
             # Check if the scenario finished before the Monitor Thread if rundown mode
             if self.rundown_mode == "1":
                 if (int(self.stop_soc) > 0):
diff --git a/core/hobl.py b/core/hobl.py
index abcbd0b..4cccc8c 100644
--- a/core/hobl.py
+++ b/core/hobl.py
@@ -113,6 +113,7 @@
 params.setDefault('global', 'trigger_soc', '5')  # Rundown trigger SoC level in percent to call post config and save etl
 params.setDefault('global', 'trigger_script', 'postconfig_etl.bat')  # Rundown trigger script to call post config and save etl
 params.setDefault('global', 'rundown_mode', '0')  # Rundown Enable Switch
+params.setDefault('global', 'rundown_quick_charge_on', '0')  # Immediately flip charger on after hitting soc level
 params.setDefault('global', 'goal_limit', '30') # Goal_limit is a percentage (30%)
 params.setDefault('global', 'warn_limit', '20') # Warn_limit is a percentage (20%)
 # params.setDefault('global', 'enable_vbs', '')