|
Yes, clean the headlight switch first. You want to spray the electrical contact cleaner inside the switch (the internal contacts, not on the contacts on the back) while turning it back and forth.
Sounds like it may have broken internal bits, though. You will probably have to replace.
|