diff --git a/lib/pages/views/homeserver_picker_view.dart b/lib/pages/views/homeserver_picker_view.dart
index 071a6a69..6766ff98 100644
--- a/lib/pages/views/homeserver_picker_view.dart
+++ b/lib/pages/views/homeserver_picker_view.dart
@@ -142,7 +142,10 @@ class HomeserverPickerView extends StatelessWidget {
                                     labelText: L10n.of(context).login,
                                   ),
                                 ),
-                              if (controller.registrationSupported)
+                              if (controller.registrationSupported &&
+                                  // Registration is broken on matrix.org
+                                  Matrix.of(context).client.homeserver.host !=
+                                      'matrix-client.matrix.org')
                                 Center(
                                   child: _LoginButton(
                                     onPressed: controller.signUpAction,