Fix initial firebase persistence