That was why I asked what brand od water heater it was. I had a similar situation in my caravan and the only way to fix it was to take out the heater and refit.
Mine was a Truma commonly called a trauma.