diff --git a/lib/views/login.dart b/lib/views/login.dart
index 9a3cea5..0424ace 100644
--- a/lib/views/login.dart
+++ b/lib/views/login.dart
@@ -42,7 +42,7 @@ class _LoginState extends State<Login> {
     }
 
     String homeserver = serverController.text;
-    if (homeserver.isEmpty) homeserver = defaultHomeserver;
+    if (homeserver.isEmpty) homeserver = "matrix-client.matrix.org";
     if (!homeserver.startsWith("https://")) {
       homeserver = "https://" + homeserver;
     }
diff --git a/lib/views/sign_up.dart b/lib/views/sign_up.dart
index b69a4e7..b6ef15b 100644
--- a/lib/views/sign_up.dart
+++ b/lib/views/sign_up.dart
@@ -51,7 +51,7 @@ class _SignUpState extends State<SignUp> {
         usernameController.text.toLowerCase().replaceAll(" ", "-");
 
     String homeserver = serverController.text;
-    if (homeserver.isEmpty) homeserver = defaultHomeserver;
+    if (homeserver.isEmpty) homeserver = "matrix-client.matrix.org";
     if (!homeserver.startsWith("https://")) {
       homeserver = "https://" + homeserver;
     }