This sounds like "water hammer"
You can fix this by adding an arrester to the water line. here is a link to what they look like and how they work
http://www.plumbingsupply.com/waterhammerarresters.htmlYou may want to check you water pressure and see if its over 80 psi.
If so then your regulator needs to be adjusted or replaced. If you home does not have a regulator and the city has upped the pressure then you will need to install one. water hammer will break pipes over time and can damage that nice water heater you have.
×