Sodium Carbon batteries have the same issue with flammable liquid organic solvent electrolytes. There is research being done into using a solid electrolyte and

Sodium Carbon batteries have the same issue with flammable liquid organic solvent electrolytes. There is research being done into using a solid electrolyte and a metal anode though.