diff --git a/changelog.d/1382.feature b/changelog.d/1382.feature
new file mode 100644
index 0000000000..1ccf533815
--- /dev/null
+++ b/changelog.d/1382.feature
@@ -0,0 +1 @@
+Let the SDK figure the best scheme given an homeserver URL (thus allowing HTTP homeservers)
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerPresenter.kt
index ef9f9e2441..8813a6a037 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerPresenter.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerPresenter.kt
@@ -27,11 +27,9 @@ import io.element.android.features.login.impl.error.ChangeServerError
 import io.element.android.libraries.architecture.Async
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.architecture.runCatchingUpdatingState
-import io.element.android.libraries.core.data.tryOrNull
 import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import java.net.URL
 import javax.inject.Inject
 
 class ChangeServerPresenter @Inject constructor(
@@ -65,8 +63,7 @@ class ChangeServerPresenter @Inject constructor(
         changeServerAction: MutableState<Async<Unit>>,
     ) = launch {
         suspend {
-            val domain = tryOrNull { URL(data.title) }?.host ?: data.title
-            authenticationService.setHomeserver(domain).map {
+            authenticationService.setHomeserver(data.title).map {
                 authenticationService.getHomeserverDetails().value!!
                 // Valid, remember user choice
                 accountProviderDataSource.userSelection(data)
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenter.kt
index d5412cb139..a647441800 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenter.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenter.kt
@@ -35,11 +35,9 @@ import io.element.android.features.login.impl.oidc.customtab.DefaultOidcActionFl
 import io.element.android.libraries.architecture.Async
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.architecture.runCatchingUpdatingState
-import io.element.android.libraries.core.data.tryOrNull
 import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import java.net.URL
 
 class ConfirmAccountProviderPresenter @AssistedInject constructor(
     @Assisted private val params: Params,
@@ -97,8 +95,7 @@ class ConfirmAccountProviderPresenter @AssistedInject constructor(
         loginFlowAction: MutableState<Async<LoginFlow>>,
     ) = launch {
         suspend {
-            val domain = tryOrNull { URL(homeserverUrl) }?.host ?: homeserverUrl
-            authenticationService.setHomeserver(domain).map {
+            authenticationService.setHomeserver(homeserverUrl).map {
                 val matrixHomeServerDetails = authenticationService.getHomeserverDetails().value!!
                 if (matrixHomeServerDetails.supportsOidcLogin) {
                     // Retrieve the details right now