diff --git a/lib/config/routes.dart b/lib/config/routes.dart
index 833f54d04..032bf08e5 100644
--- a/lib/config/routes.dart
+++ b/lib/config/routes.dart
@@ -21,7 +21,7 @@ import 'package:fluffychat/pages/device_settings/device_settings.dart';
 import 'package:fluffychat/pages/login/login.dart';
 import 'package:fluffychat/pages/new_group/new_group.dart';
 import 'package:fluffychat/pages/new_private_chat/new_private_chat.dart';
-import 'package:fluffychat/pages/onboarding/enable_notificatons.dart';
+import 'package:fluffychat/pages/onboarding/enable_notifications.dart';
 import 'package:fluffychat/pages/onboarding/space_code_onboarding.dart';
 import 'package:fluffychat/pages/settings/settings.dart';
 import 'package:fluffychat/pages/settings_3pid/settings_3pid.dart';
diff --git a/lib/pages/onboarding/enable_notificatons.dart b/lib/pages/onboarding/enable_notifications.dart
similarity index 92%
rename from lib/pages/onboarding/enable_notificatons.dart
rename to lib/pages/onboarding/enable_notifications.dart
index bd282f22e..e3586033a 100644
--- a/lib/pages/onboarding/enable_notificatons.dart
+++ b/lib/pages/onboarding/enable_notifications.dart
@@ -14,11 +14,11 @@ class EnableNotifications extends StatefulWidget {
   const EnableNotifications({super.key});
 
   @override
-  EnabledNotificationsController createState() =>
-      EnabledNotificationsController();
+  EnableNotificationsController createState() =>
+      EnableNotificationsController();
 }
 
-class EnabledNotificationsController extends State<EnableNotifications> {
+class EnableNotificationsController extends State<EnableNotifications> {
   Profile? profile;
 
   @override
@@ -49,7 +49,7 @@ class EnabledNotificationsController extends State<EnableNotifications> {
   Future<void> _requestNotificationPermission() async {
     await Matrix.of(context).requestNotificationPermission();
     if (mounted) {
-      context.push("/registration/course");
+      context.go("/registration/course");
     }
   }
 
@@ -115,7 +115,7 @@ class EnabledNotificationsController extends State<EnableNotifications> {
             ),
             TextButton(
               child: Text(L10n.of(context).skipForNow),
-              onPressed: () => context.push("/registration/course"),
+              onPressed: () => context.go("/registration/course"),
             ),
           ],
         ),
diff --git a/lib/widgets/matrix.dart b/lib/widgets/matrix.dart
index 063c3da30..808678ffb 100644
--- a/lib/widgets/matrix.dart
+++ b/lib/widgets/matrix.dart
@@ -645,6 +645,7 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
     // #Pangea
     _languageListener?.cancel();
     _uriListener?.cancel();
+    notifPermissionNotifier.dispose();
     // Pangea#
 
     super.dispose();