diff --git a/common/charge_state.c b/common/charge_state.c
index cfc1620db4..39648695cd 100644
--- a/common/charge_state.c
+++ b/common/charge_state.c
@@ -335,7 +335,8 @@ static enum power_state state_charge(struct power_state_context *ctx)
 	if (ctx->curr.error)
 		return PWR_STATE_ERROR;
 
-	if (ctx->curr.batt.desired_current < ctx->charger->current_min)
+	if (ctx->curr.batt.desired_current < ctx->charger->current_min &&
+	    ctx->curr.batt.desired_current > 0)
 		return trickle_charge(ctx);
 
 	/* Check charger reset */