diff --git a/lib/pangea/pages/sign_up/full_width_button.dart b/lib/pangea/pages/sign_up/full_width_button.dart
index b7ef42a0c..40b85942b 100644
--- a/lib/pangea/pages/sign_up/full_width_button.dart
+++ b/lib/pangea/pages/sign_up/full_width_button.dart
@@ -62,7 +62,13 @@ class FullWidthButtonState extends State<FullWidthButton> {
                       mainAxisAlignment: MainAxisAlignment.center,
                       children: [
                         widget.loading
-                            ? const Expanded(child: LinearProgressIndicator())
+                            ? const Expanded(
+                                child: SizedBox(
+                                  height: 18,
+                                  child:
+                                      Center(child: LinearProgressIndicator()),
+                                ),
+                              )
                             : widget.title,
                       ],
                     ),
diff --git a/lib/pangea/pages/sign_up/user_settings.dart b/lib/pangea/pages/sign_up/user_settings.dart
index 76d7aa883..35cd72203 100644
--- a/lib/pangea/pages/sign_up/user_settings.dart
+++ b/lib/pangea/pages/sign_up/user_settings.dart
@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:fluffychat/pangea/controllers/language_list_controller.dart';
 import 'package:fluffychat/pangea/controllers/pangea_controller.dart';
 import 'package:fluffychat/pangea/models/language_model.dart';
@@ -145,7 +147,12 @@ class UserSettingsState extends State<UserSettingsPage> {
           waitForDataInSync: true,
         ),
       ];
-      await Future.wait(updateFuture);
+      await Future.wait(updateFuture).timeout(
+        const Duration(seconds: 30),
+        onTimeout: () {
+          throw TimeoutException(L10n.of(context).oopsSomethingWentWrong);
+        },
+      );
       context.go('/rooms');
     } catch (err) {
       if (err is MatrixException) {