Hi my baxi 105e , has got a noisy diverter valve . when the heating is on and I run the hot water no noise but when I turn the hot water off it makes a noisey piston noise. If the heating is off and I run the hot water I don't get any noise. I just had it serviced is it worth getting the guy back for a look