My Vaillant Turbomax plus 824E does the same thing. The pipes hammer when the hot water is drawn or shut off as you open ot shut the tap only when the heating is on. This has only occured since the diverter valve was replaced. (faulty valve). Everything was OK at first then gradually the hammering b...