Yep, I have a regular fire extinguisher under the tank now - I'm moving in November and my dad is an electrician - I'll ask him to take a look thanks for the reply