diff --git a/lib/main.dart b/lib/main.dart
index 940eb96f..a01bf7b0 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -80,7 +80,6 @@ class FluffyChatApp extends StatefulWidget {
 }
 
 class _FluffyChatAppState extends State<FluffyChatApp> {
-  final GlobalKey<MatrixState> _matrix = GlobalKey<MatrixState>();
   GlobalKey<VRouterState> _router;
   bool columnMode;
   String _initialUrl;
@@ -147,7 +146,6 @@ class _FluffyChatAppState extends State<FluffyChatApp> {
                 );
               });
               return Matrix(
-                key: _matrix,
                 context: context,
                 router: _router,
                 clients: widget.clients,
diff --git a/lib/widgets/matrix.dart b/lib/widgets/matrix.dart
index a65c251c..056ff566 100644
--- a/lib/widgets/matrix.dart
+++ b/lib/widgets/matrix.dart
@@ -345,7 +345,7 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
       }
     });
     onUiaRequest[name] ??= c.onUiaRequest.stream.listen(
-      UiaRequestManager(client, L10n.of(context), navigatorContext)
+      UiaRequestManager(client, L10n.of(widget.context), navigatorContext)
           .onUiaRequest,
     );
     if (PlatformInfos.isWeb || PlatformInfos.isLinux) {
diff --git a/pubspec.yaml b/pubspec.yaml
index d6e96e9c..08cdbf84 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -45,7 +45,7 @@ dependencies:
   intl: any
   localstorage: ^4.0.0+1
   lottie: ^1.2.1
-  matrix: ^0.6.1
+  matrix: ^0.6.2
   matrix_link_text: ^1.0.2
   native_imaging:
     git: https://gitlab.com/famedly/libraries/native_imaging.git