diff --git a/driver/charger/bd99955.c b/driver/charger/bd99955.c
index 4ad95cc3eb..7e76e54be6 100644
--- a/driver/charger/bd99955.c
+++ b/driver/charger/bd99955.c
@@ -401,6 +401,10 @@ int charger_set_input_current(int input_current)
 
 	/* Input current step 32 mA */
 	input_current &= ~0x1F;
+
+	if (input_current < bd99955_charger_info.input_current_min)
+		input_current = bd99955_charger_info.input_current_min;
+
 	rv = ch_raw_write16(BD99955_CMD_IBUS_LIM_SET, input_current,
 				BD99955_BAT_CHG_COMMAND);
 	if (rv)
diff --git a/driver/charger/bd99955.h b/driver/charger/bd99955.h
index 86f438553c..f6ef29a2c6 100644
--- a/driver/charger/bd99955.h
+++ b/driver/charger/bd99955.h
@@ -36,7 +36,7 @@ enum bd99955_charge_port {
 #define CHARGE_I_OFF	0
 #define CHARGE_I_STEP	64
 #define INPUT_I_MAX	16352
-#define INPUT_I_MIN	0
+#define INPUT_I_MIN	512
 #define INPUT_I_STEP	32
 
 /* Battery Charger Commands */