diff --git a/lib/pages/sign_in/view_model/sign_in_view_model.dart b/lib/pages/sign_in/view_model/sign_in_view_model.dart
index 55ff005c1..fefa29d3e 100644
--- a/lib/pages/sign_in/view_model/sign_in_view_model.dart
+++ b/lib/pages/sign_in/view_model/sign_in_view_model.dart
@@ -75,13 +75,13 @@ class SignInViewModel extends ValueNotifier<SignInState> {
 
       publicHomeservers.sort(sortHomeservers);
 
-      final defaultServer =
-          publicHomeservers.singleWhereOrNull(
-            (server) => server.name == AppSettings.defaultHomeserver.value,
-          ) ??
-          defaultHomeserverData;
+      final defaultServer = publicHomeservers.singleWhereOrNull(
+        (server) => server.name == AppSettings.defaultHomeserver.value,
+      );
 
-      publicHomeservers.insert(0, defaultServer);
+      if (defaultServer == null) {
+        publicHomeservers.insert(0, defaultHomeserverData);
+      }
 
       value = value.copyWith(
         selectedHomeserver: value.selectedHomeserver ?? publicHomeservers.first,