We had to put a new water heater in as well and selected the Raritan. had a little of the same problem, but ran it empty and then fill up and empty again ca. 5 times and the problems were gone and have not reoccurred. I'm very happy with my Raritan water heater! YMMV Hans