diff --git a/lib/providers/user.dart b/lib/providers/user.dart
index ec703e1..d87e0ce 100644
--- a/lib/providers/user.dart
+++ b/lib/providers/user.dart
@@ -36,7 +36,8 @@ class UserProvider extends CoreProvier {
     }
     if (service.isSuccess) {
       user = User.fromJson(service.result['user']);
-      await _registerFirebaseToken();
+      AppInitializer.initializeFirebase().then((_) => _registerFirebaseToken());
+      _registerFirebaseToken();
       return true;
     }
     throw 'Getting user from API failed!';
diff --git a/lib/services/app_initalizer.dart b/lib/services/app_initalizer.dart
index 78a3f4b..33c0170 100644
--- a/lib/services/app_initalizer.dart
+++ b/lib/services/app_initalizer.dart
@@ -15,7 +15,6 @@ class AppInitializer {
       StorageService.appDocsDir =
           (await getApplicationDocumentsDirectory()).path;
       StorageService.appTempsDir = (await getTemporaryDirectory()).path;
-      await _initializeFirebase();
       MediaService.init();
     }
   }
@@ -62,7 +61,7 @@ class AppInitializer {
     }
   }
 
-  static Future<void> _initializeFirebase() async {
+  static Future<void> initializeFirebase() async {
     try {
       await Firebase.initializeApp(
         options: const FirebaseOptions(