diff --git a/board/pyro/battery.c b/board/pyro/battery.c
index a87c514f51..da5868af8a 100644
--- a/board/pyro/battery.c
+++ b/board/pyro/battery.c
@@ -8,6 +8,7 @@
 #include "battery.h"
 #include "battery_smart.h"
 #include "bd9995x.h"
+#include "charge_ramp.h"
 #include "charge_state.h"
 #include "console.h"
 #include "ec_commands.h"
@@ -245,11 +246,17 @@ int charger_profile_override(struct charge_state_data *curr)
 	 *
 	 * To overcome this issue enable the battery learning operation
 	 * and suspend USB charging and DC/DC converter.
+	 *
+	 * And also to avoid inrush current from the external charger, enable
+	 * discharge on AC till the new charger is detected and charge detect
+	 * delay has passed.
 	 */
-	disch_on_ac = curr->batt.is_present == BP_YES &&
+	disch_on_ac = (curr->batt.is_present == BP_YES &&
 			!battery_is_cut_off() &&
 			!(curr->batt.flags & BATT_FLAG_WANT_CHARGE) &&
 			curr->batt.status & STATUS_FULLY_CHARGED;
+			(!chg_ramp_is_detected() &&
+			curr->batt.state_of_charge > 2);
 
 	charger_discharge_on_ac(disch_on_ac);
 
diff --git a/board/pyro/board.c b/board/pyro/board.c
index 7253543d2f..8a10409d10 100644
--- a/board/pyro/board.c
+++ b/board/pyro/board.c
@@ -568,6 +568,14 @@ int board_set_active_charge_port(int charge_port)
 	case CHARGE_PORT_NONE:
 		bd9995x_port_select = 0;
 		bd9995x_port = BD9995X_CHARGE_PORT_BOTH;
+
+		/*
+		 * To avoid inrush current from the external charger, enable
+		 * discharge on AC till the new charger is detected and
+		 * charge detect delay has passed.
+		 */
+		if (charge_get_percent() > 2)
+			charger_discharge_on_ac(1);
 		break;
 	default:
 		panic("Invalid charge port\n");
diff --git a/board/snappy/battery.c b/board/snappy/battery.c
index 5ba4c0ac28..9884400264 100644
--- a/board/snappy/battery.c
+++ b/board/snappy/battery.c
@@ -8,6 +8,7 @@
 #include "battery.h"
 #include "battery_smart.h"
 #include "bd9995x.h"
+#include "charge_ramp.h"
 #include "charge_state.h"
 #include "console.h"
 #include "ec_commands.h"
@@ -173,11 +174,17 @@ int charger_profile_override(struct charge_state_data *curr)
 	 *
 	 * To overcome this issue enable the battery learning operation
 	 * and suspend USB charging and DC/DC converter.
+	 *
+	 * And also to avoid inrush current from the external charger, enable
+	 * discharge on AC till the new charger is detected and charge detect
+	 * delay has passed.
 	 */
-	disch_on_ac = curr->batt.is_present == BP_YES &&
+	disch_on_ac = (curr->batt.is_present == BP_YES &&
 			!battery_is_cut_off() &&
 			!(curr->batt.flags & BATT_FLAG_WANT_CHARGE) &&
 			curr->batt.status & STATUS_FULLY_CHARGED;
+			(!chg_ramp_is_detected() &&
+			curr->batt.state_of_charge > 2);
 
 	charger_discharge_on_ac(disch_on_ac);
 
diff --git a/board/snappy/board.c b/board/snappy/board.c
index 0848857f2a..d2f62edf8a 100644
--- a/board/snappy/board.c
+++ b/board/snappy/board.c
@@ -567,6 +567,14 @@ int board_set_active_charge_port(int charge_port)
 	case CHARGE_PORT_NONE:
 		bd9995x_port_select = 0;
 		bd9995x_port = BD9995X_CHARGE_PORT_BOTH;
+
+		/*
+		 * To avoid inrush current from the external charger, enable
+		 * discharge on AC till the new charger is detected and
+		 * charge detect delay has passed.
+		 */
+		if (charge_get_percent() > 2)
+			charger_discharge_on_ac(1);
 		break;
 	default:
 		panic("Invalid charge port\n");