diff --git a/board/scarlet/battery.c b/board/scarlet/battery.c
index d84e8c1d6c..bc3ec6e84c 100644
--- a/board/scarlet/battery.c
+++ b/board/scarlet/battery.c
@@ -14,6 +14,7 @@
 #include "ec_commands.h"
 #include "extpower.h"
 #include "gpio.h"
+#include "hooks.h"
 #include "util.h"
 
 /*
@@ -244,6 +245,19 @@ int charger_profile_override(struct charge_state_data *curr)
 	return 0;
 }
 
+static void board_charge_termination(void)
+{
+	static uint8_t te;
+	/* Enable charge termination when we are sure battery is present. */
+	if (!te && battery_is_present() == BP_YES) {
+		if (!rt946x_enable_charge_termination(1))
+			te = 1;
+	}
+}
+DECLARE_HOOK(HOOK_BATTERY_SOC_CHANGE,
+	     board_charge_termination,
+	     HOOK_PRIO_DEFAULT);
+
 /* Customs options controllable by host command. */
 #define PARAM_FASTCHARGE (CS_PARAM_CUSTOM_PROFILE_MIN + 0)
 
diff --git a/driver/charger/rt946x.c b/driver/charger/rt946x.c
index 378d8f6814..7d724e68c2 100644
--- a/driver/charger/rt946x.c
+++ b/driver/charger/rt946x.c
@@ -397,10 +397,6 @@ static int rt946x_init_setting(void)
 	if (rv)
 		return rv;
 	rv = rt946x_set_iprec(batt_info->precharge_current);
-	if (rv)
-		return rv;
-	/* Enable charge current termination */
-	rv = rt946x_set_bit(RT946X_REG_CHGCTRL2, RT946X_MASK_TE);
 	if (rv)
 		return rv;
 
@@ -903,3 +899,9 @@ int rt946x_cutoff_battery(void)
 {
 	return rt946x_set_bit(RT946X_REG_CHGCTRL2, RT946X_MASK_SHIP_MODE);
 }
+
+int rt946x_enable_charge_termination(int en)
+{
+	return (en ? rt946x_set_bit : rt946x_clr_bit)
+		(RT946X_REG_CHGCTRL2, RT946X_MASK_TE);
+}
diff --git a/driver/charger/rt946x.h b/driver/charger/rt946x.h
index 48f9cd02e9..d597ac8aaa 100644
--- a/driver/charger/rt946x.h
+++ b/driver/charger/rt946x.h
@@ -311,4 +311,7 @@ int rt946x_is_vbus_ready(void);
  */
 int rt946x_cutoff_battery(void);
 
+/* Enable/Disable charge temination */
+int rt946x_enable_charge_termination(int en);
+
 #endif /* __CROS_EC_RT946X_H */