diff --git a/lib/main.dart b/lib/main.dart
index f7bb59b94..d19060e79 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -33,14 +33,14 @@ import 'package:talawa/views/base_view.dart';
 ///
 /// **returns**:
 /// * `Future<void>`: promise that will be fulfilled message background activities are successful.
-Future<void> _firebaseMessagingBackgroundHandler(RemoteMessage message) async {
-  // If you're going to use other Firebase services in the background, such as Firestore,
-  // make sure you call `initializeApp` before using other Firebase services.
-  final Directory dir = await path.getApplicationDocumentsDirectory();
-  Hive.init(dir.path);
-  await setUpFirebaseKeys();
-  await setUpFirebase();
-}
+// Future<void> _firebaseMessagingBackgroundHandler(RemoteMessage message) async {
+//   // If you're going to use other Firebase services in the background, such as Firestore,
+//   // make sure you call `initializeApp` before using other Firebase services.
+//   final Directory dir = await path.getApplicationDocumentsDirectory();
+//   Hive.init(dir.path);
+//   await setUpFirebaseKeys();
+//   await setUpFirebase();
+// }
 
 /// Initializes the firebase in the app according to the userplatform (android/iOS).
 ///
diff --git a/lib/view_model/pre_auth_view_models/login_view_model.dart b/lib/view_model/pre_auth_view_models/login_view_model.dart
index cf548df48..53fde4aa8 100644
--- a/lib/view_model/pre_auth_view_models/login_view_model.dart
+++ b/lib/view_model/pre_auth_view_models/login_view_model.dart
@@ -119,7 +119,7 @@ class LoginViewModel extends BaseModel {
               queries.saveFcmToken(token),
             );
 
-            //await setUpFirebaseMessaging();
+            ///await setUpFirebaseMessaging();
 
             final androidFirebaseOptionsBox =
                 await Hive.openBox('androidFirebaseOptions');