A.check and reduce your heater’s temperature setting.
B.you must fully open the shut-off valve and ensure more water flow