diff --git a/driver/charger/bd99955.c b/driver/charger/bd99955.c
index 2ec56ffce9..f6a6519478 100644
--- a/driver/charger/bd99955.c
+++ b/driver/charger/bd99955.c
@@ -592,6 +592,8 @@ int charger_get_current(int *current)
 
 int charger_set_current(int current)
 {
+	int rv;
+
 	/* Charge current step 64 mA */
 	current &= ~0x3F;
 
@@ -601,8 +603,14 @@ int charger_set_current(int current)
 	else if (current < bd99955_charger_info.current_min)
 		current = bd99955_charger_info.current_min;
 
-	return ch_raw_write16(BD99955_CMD_CHG_CURRENT, current,
-				BD99955_BAT_CHG_COMMAND);
+	rv = ch_raw_write16(BD99955_CMD_CHG_CURRENT, current,
+			    BD99955_BAT_CHG_COMMAND);
+	if (rv)
+		return rv;
+
+	return ch_raw_write16(BD99955_CMD_IPRECH_SET,
+			      MIN(current, BD99955_IPRECH_MAX),
+			      BD99955_EXTENDED_COMMAND);
 }
 
 int charger_get_voltage(int *voltage)
diff --git a/driver/charger/bd99955.h b/driver/charger/bd99955.h
index 71d9e891a7..e5cf666380 100644
--- a/driver/charger/bd99955.h
+++ b/driver/charger/bd99955.h
@@ -108,7 +108,10 @@ enum bd99955_charge_port {
 #define BD99955_CMD_VSYSVAL_THH_SET	0x12
 #define BD99955_CMD_VSYSVAL_THL_SET	0x13
 #define BD99955_CMD_ITRICH_SET		0x14
+
 #define BD99955_CMD_IPRECH_SET		0x15
+#define BD99955_IPRECH_MAX		1024
+
 #define BD99955_CMD_ICHG_SET		0x16
 #define BD99955_CMD_ITERM_SET		0x17
 #define BD99955_CMD_VPRECHG_TH_SET	0x18