diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/HomeserverResolver.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/HomeserverResolver.kt
index c43839517c..4cf1d416e8 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/HomeserverResolver.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/HomeserverResolver.kt
@@ -52,9 +52,10 @@ class HomeserverResolver(
                 }
             }
         }
-        // If list is empty, and the user has entered an URL, do not block the user.
-        if (currentList.isEmpty() && trimmedUserInput.isValidUrl()) {
-            emit(listOf(HomeserverData(homeserverUrl = trimmedUserInput)))
+        // If list is empty, and candidateBase is a valid an URL, do not block the user.
+        // A unsupported homeserver / homeserver not found error will be displayed if the user continues
+        if (currentList.isEmpty() && candidateBase.isValidUrl()) {
+            emit(listOf(HomeserverData(homeserverUrl = candidateBase)))
         }
     }
 
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderPresenterTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderPresenterTest.kt
index 67453119c7..f4c193ced2 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderPresenterTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderPresenterTest.kt
@@ -85,7 +85,13 @@ class SearchAccountProviderPresenterTest {
             assertThat(withInputState.userInput).isEqualTo("test")
             assertThat(initialState.userInputResult).isEqualTo(AsyncData.Uninitialized)
             assertThat(awaitItem().userInputResult).isInstanceOf(AsyncData.Loading::class.java)
-            assertThat(awaitItem().userInputResult).isEqualTo(AsyncData.Uninitialized)
+            assertThat(awaitItem().userInputResult).isEqualTo(
+                AsyncData.Success(
+                    listOf(
+                        aHomeserverData(homeserverUrl = "https://test"),
+                    )
+                )
+            )
         }
     }