diff --git a/board/kevin/usb_pd_policy.c b/board/kevin/usb_pd_policy.c
index 0afe188de9..23c8645f84 100644
--- a/board/kevin/usb_pd_policy.c
+++ b/board/kevin/usb_pd_policy.c
@@ -50,8 +50,9 @@ void pd_transition_voltage(int idx)
 
 int pd_set_power_supply_ready(int port)
 {
-	/* Disable charging */
-	bd99955_select_input_port(BD99955_CHARGE_PORT_NONE);
+	/* Ensure we're not charging from this port */
+	if (charge_manager_get_active_charge_port() == port)
+		bd99955_select_input_port(BD99955_CHARGE_PORT_NONE);
 
 	/* Provide VBUS */
 	gpio_set_level(port ? GPIO_C1_VOUT_EN_L :