diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart
index 956b387a..09b70d1a 100644
--- a/lib/pages/landing/landing_page.dart
+++ b/lib/pages/landing/landing_page.dart
@@ -107,7 +107,7 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
   late Timer timeOutTimer;
   bool isTalking = false;
 
-  var sharedPref = new AppSharedPreferences();
+  bool isModalBottomSheetShowing = false;
 
   //
   // var data = {
@@ -733,17 +733,18 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
   checkLastLoginStatus(AuthenticatedUser user, String deviceToken) async {
     int lastLoginStatus = await sharedPref.getInt(LAST_LOGIN) != null ? await sharedPref.getInt(LAST_LOGIN) : 1;
 
-    if (lastLoginStatus == 1 || lastLoginStatus == 4) {
-      if (await sharedPref.getBool(HAS_ENABLED_QUICK_LOGIN) == null || !await sharedPref.getBool(HAS_ENABLED_QUICK_LOGIN)) {
-        showQuickLoginBottomSheet(context, user, deviceToken, false);
-      }
+    // if (lastLoginStatus == 1 || lastLoginStatus == 4) {
+    //   if (await sharedPref.getBool(HAS_ENABLED_QUICK_LOGIN) == null || !await sharedPref.getBool(HAS_ENABLED_QUICK_LOGIN)) {
+    showQuickLoginBottomSheet(context, user, deviceToken, false);
+    // }
 
-      // showQuickLoginBottomSheet(context, user, deviceToken, false);
-    }
+    // showQuickLoginBottomSheet(context, user, deviceToken, false);
+    // }
   }
 
-  void showQuickLoginBottomSheet(BuildContext context, AuthenticatedUser user, String deviceToken, bool isDone) {
-    showModalBottomSheet(
+  void showQuickLoginBottomSheet(BuildContext context, AuthenticatedUser user, String deviceToken, bool isDone) async {
+    isModalBottomSheetShowing = true;
+    await showModalBottomSheet(
       context: context,
       backgroundColor: Colors.transparent,
       isScrollControlled: true,
@@ -762,6 +763,7 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
       ),
     ).then((value) {
       sharedPref.setBool(HAS_ENABLED_QUICK_LOGIN, value ?? true);
+      isModalBottomSheetShowing = false;
     });
   }
 
@@ -809,7 +811,9 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
       showQuickLoginBottomSheet(context, user, deviceToken, true);
 
       Future.delayed(Duration(seconds: 3), () {
-        Navigator.of(context).pop();
+        if (isModalBottomSheetShowing) {
+          Navigator.of(context).pop();
+        }
       });
       insertIMEI(lastLogin, deviceToken);
     }