Yes the unit will stop charging and go to a trickle charge once the light is fully charged so the light is always at full charge.