diff --git a/lib/app.dart b/lib/app.dart
index 7166d22..0576e6f 100644
--- a/lib/app.dart
+++ b/lib/app.dart
@@ -136,13 +136,11 @@ class _AppMainWidgetState extends State<AppMainWidget> {
   bool _isLoaded = false;
   bool _skipBackup = false;
   bool _isTwonlyLocked = true;
-  int _initialPage = 0;
 
   (Future<int>?, bool) _proofOfWork = (null, false);
 
   @override
   void initState() {
-    _initialPage = widget.initialPage;
     initAsync();
     super.initState();
   }
@@ -158,9 +156,6 @@ class _AppMainWidgetState extends State<AppMainWidget> {
       if (gUser.appVersion < 62) {
         _showDatabaseMigration = true;
       }
-      if (!gUser.startWithCameraOpen) {
-        _initialPage = 0;
-      }
     }
 
     if (!_isUserCreated && !_showDatabaseMigration) {
@@ -210,7 +205,7 @@ class _AppMainWidgetState extends State<AppMainWidget> {
         );
       } else {
         child = HomeView(
-          initialPage: _initialPage,
+          initialPage: widget.initialPage,
         );
       }
     } else if (_showOnboarding) {
diff --git a/lib/src/views/home.view.dart b/lib/src/views/home.view.dart
index f208d90..8d5b889 100644
--- a/lib/src/views/home.view.dart
+++ b/lib/src/views/home.view.dart
@@ -135,7 +135,8 @@ class HomeViewState extends State<HomeView> {
       _mainCameraController.setSharedLinkForPreview,
     );
     WidgetsBinding.instance.addPostFrameCallback((_) {
-      if (widget.initialPage == 0) {
+      if (widget.initialPage == 1 && !gUser.startWithCameraOpen ||
+          widget.initialPage == 0) {
         globalUpdateOfHomeViewPageIndex(0);
       }
     });
@@ -161,10 +162,15 @@ class HomeViewState extends State<HomeView> {
       if (notificationAppLaunchDetails?.didNotificationLaunchApp ?? false) {
         final payload =
             notificationAppLaunchDetails?.notificationResponse?.payload;
-        if (payload != null && payload.startsWith(Routes.chats)) {
+        if (payload != null &&
+            payload.startsWith(Routes.chats) &&
+            payload != Routes.chats) {
           await routerProvider.push(payload);
           globalUpdateOfHomeViewPageIndex(0);
         }
+        if (payload == Routes.chats) {
+          globalUpdateOfHomeViewPageIndex(0);
+        }
       }
     }