The disclosure relates to systems and methods for controlling the sodium and bicarbonate concentrations in a dialysate. The systems and methods can use conductivity sensors to control the addition of water and bicarbonate to accurately control the final concentrations of both sodium and bicarbonate.