diff --git a/lib/app/settings/views/settings_screen.dart b/lib/app/settings/views/settings_screen.dart
index aea6e99..dacfd1e 100644
--- a/lib/app/settings/views/settings_screen.dart
+++ b/lib/app/settings/views/settings_screen.dart
@@ -57,7 +57,7 @@ class _SettingsScreenState extends ConsumerState<SettingsScreen> {
                 }
 
                 if (!context.mounted) return;
-                Navigator.of(context).pop();
+                context.pop();                
               }
             },
           ),
diff --git a/lib/route_config.dart b/lib/route_config.dart
index b336a64..20c0727 100644
--- a/lib/route_config.dart
+++ b/lib/route_config.dart
@@ -16,8 +16,8 @@ import 'package:petjournal/app/pet/views/edit_pet_screen.dart';
 import 'package:petjournal/app/pet/views/edit_pet_vaccination_screen.dart';
 import 'package:petjournal/app/pet/views/edit_pet_weight_screen.dart';
 import 'package:petjournal/app/pet/views/view_pet_screen.dart';
-import 'package:petjournal/app/settings/controllers/settings_controller.dart';
 import 'package:petjournal/app/settings/views/settings_screen.dart';
+import 'package:petjournal/data/lookups/settings_lookup.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'route_config.g.dart';
@@ -49,7 +49,11 @@ GoRouter setupRouter(Ref ref) {
     //initialExtra: initialExtra,
     //observers: observers,
     redirect: (context, state) {
-      final settings = ref.read(settingsControllerProvider).requireValue;
+      var settings = SettingsLookup().getSettings();
+      if (settings == null) {
+        return null;
+      }
+
       final path = state.uri.path;
       if (!settings.onBoardingComplete) {
         if (path != RouteDefs.welcome) {
diff --git a/pubspec.lock b/pubspec.lock
index 36be008..1d4d7f7 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -452,10 +452,10 @@ packages:
     dependency: "direct main"
     description:
       name: go_router
-      sha256: f02fd7d2a4dc512fec615529824fdd217fecb3a3d3de68360293a551f21634b3
+      sha256: eb059dfe59f08546e9787f895bd01652076f996bcbf485a8609ef990419ad227
       url: "https://pub.dev"
     source: hosted
-    version: "14.8.1"
+    version: "16.2.1"
   graphs:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 7d11fee..ea82312 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -36,7 +36,7 @@ dependencies:
   cupertino_icons: ^1.0.8
   drift: ^2.26.0
   drift_flutter: ^0.2.4
-  go_router: ^14.8.1
+  go_router: ^16.2.1
   flutter_riverpod: ^2.6.1
   riverpod_annotation: ^2.6.1
   material_color_utilities: ^0.11.1