Changing the switch is probably a good idea but when you do, if it is attached to any kind of pipe or tube, make sure the pipe is cleaned out before re-installing. Also, make sure the air charge in the bladder tank is correct for the switch. It should have 2lbs. less air pressure than the cut in pressure of the switch. Adjustment needs to be made with the pump off and the tank drained of pressure. If you get water out of the air valve the tank is bad and will need to be replaced.