This model is known to have issues, replacing with a different heater would be a relatively straightforward process and would keep any issues from arising. Seeing as this is the second issue you’ve experienced with it.
