diff --git a/lib/pages/login/login.dart b/lib/pages/login/login.dart
index 4afbdc06..e3f8afde 100644
--- a/lib/pages/login/login.dart
+++ b/lib/pages/login/login.dart
@@ -155,6 +155,9 @@ class LoginController extends State<Login> {
           AppConfig.jitsiInstance = jitsi;
         }
         setState(() => usernameError = null);
+      } else {
+        setState(() =>
+            Matrix.of(context).getLoginClient().homeserver = oldHomeserver);
       }
     } catch (e) {
       setState(() => usernameError = e.toString());