diff --git a/mobile/lib/providers/routes.provider.dart b/mobile/lib/providers/routes.provider.dart
index 6cc3d08c5d..776389b330 100644
--- a/mobile/lib/providers/routes.provider.dart
+++ b/mobile/lib/providers/routes.provider.dart
@@ -5,9 +5,6 @@ import 'package:immich_mobile/routing/router.dart';
 @visibleForTesting
 bool isRouteInStack(Ref ref, String routeName) {
   final router = ref.watch(appRouterProvider);
-  void onChange() => ref.invalidateSelf();
-  router.addListener(onChange);
-  ref.onDispose(() => router.removeListener(onChange));
   return router.stackData.any((route) => route.name == routeName);
 }
 
diff --git a/mobile/lib/routing/app_navigation_observer.dart b/mobile/lib/routing/app_navigation_observer.dart
index f126788008..a7f6d532e9 100644
--- a/mobile/lib/routing/app_navigation_observer.dart
+++ b/mobile/lib/routing/app_navigation_observer.dart
@@ -13,6 +13,8 @@ class AppNavigationObserver extends AutoRouterObserver {
 
   @override
   void didPush(Route route, Route? previousRoute) {
+    ref.invalidate(inLockedViewProvider);
+    ref.invalidate(isAssetViewerOpenProvider);
     unawaited(
       Future(() {
         ref.read(currentRouteNameProvider.notifier).state = route.settings.name;
@@ -21,4 +23,10 @@ class AppNavigationObserver extends AutoRouterObserver {
       }),
     );
   }
+
+  @override
+  void didPop(Route route, Route? previousRoute) {
+    ref.invalidate(inLockedViewProvider);
+    ref.invalidate(isAssetViewerOpenProvider);
+  }
 }