diff --git a/lib/pangea/login/pages/user_settings.dart b/lib/pangea/login/pages/user_settings.dart
index 3e9faeb4f..c09d9f5bd 100644
--- a/lib/pangea/login/pages/user_settings.dart
+++ b/lib/pangea/login/pages/user_settings.dart
@@ -16,6 +16,7 @@ import 'package:fluffychat/pangea/learning_settings/utils/p_language_store.dart'
 import 'package:fluffychat/pangea/login/pages/user_settings_view.dart';
 import 'package:fluffychat/utils/file_selector.dart';
 import 'package:fluffychat/utils/localized_exception_extension.dart';
+import 'package:fluffychat/widgets/future_loading_dialog.dart';
 import 'package:fluffychat/widgets/matrix.dart';
 
 class UserSettingsPage extends StatefulWidget {
@@ -226,11 +227,15 @@ class UserSettingsState extends State<UserSettingsPage> {
           level: 1,
         ),
       ];
-      await Future.wait(updateFuture).timeout(
-        const Duration(seconds: 30),
-        onTimeout: () {
-          throw TimeoutException(L10n.of(context).oopsSomethingWentWrong);
-        },
+
+      await showFutureLoadingDialog(
+        context: context,
+        future: () => Future.wait(updateFuture).timeout(
+          const Duration(seconds: 30),
+          onTimeout: () {
+            throw TimeoutException(L10n.of(context).oopsSomethingWentWrong);
+          },
+        ),
       );
       context.go(
         _pangeaController.classController.cachedClassCode == null