diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart
index 85bc1237f..234b43b74 100644
--- a/lib/pages/chat_list/chat_list.dart
+++ b/lib/pages/chat_list/chat_list.dart
@@ -680,10 +680,7 @@ class ChatListController extends State<ChatList>
   }
 
   @override
-  Widget build(BuildContext context) {
-    Matrix.of(context).navigatorContext = context;
-    return ChatListView(this);
-  }
+  Widget build(BuildContext context) => ChatListView(this);
 
   void _hackyWebRTCFixForWeb() {
     ChatList.contextForVoip = context;
diff --git a/lib/pages/homeserver_picker/homeserver_picker.dart b/lib/pages/homeserver_picker/homeserver_picker.dart
index 5272afcd1..95d213e8a 100644
--- a/lib/pages/homeserver_picker/homeserver_picker.dart
+++ b/lib/pages/homeserver_picker/homeserver_picker.dart
@@ -165,10 +165,7 @@ class HomeserverPickerController extends State<HomeserverPicker> {
   }
 
   @override
-  Widget build(BuildContext context) {
-    Matrix.of(context).navigatorContext = context;
-    return HomeserverPickerView(this);
-  }
+  Widget build(BuildContext context) => HomeserverPickerView(this);
 
   Future<void> restoreBackup() async {
     final picked = await FilePicker.platform.pickFiles(withData: true);
diff --git a/lib/widgets/matrix.dart b/lib/widgets/matrix.dart
index 8d4ddad11..3ba4005c9 100644
--- a/lib/widgets/matrix.dart
+++ b/lib/widgets/matrix.dart
@@ -339,13 +339,7 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
           );
         }
       } else {
-        navigatorContext.go(
-          Uri(
-            path: state == LoginState.loggedIn ? '/rooms' : '/home',
-            queryParameters:
-                GoRouterState.of(navigatorContext).uri.queryParameters,
-          ).toString(),
-        );
+        navigatorContext.go(state == LoginState.loggedIn ? '/rooms' : '/home');
       }
     });
     onUiaRequest[name] ??= c.onUiaRequest.stream.listen(uiaRequestHandler);