diff --git a/crates/matrix-sdk/src/client/builder/homeserver_config.rs b/crates/matrix-sdk/src/client/builder/homeserver_config.rs
index f2f29ada3b6..373666b6165 100644
--- a/crates/matrix-sdk/src/client/builder/homeserver_config.rs
+++ b/crates/matrix-sdk/src/client/builder/homeserver_config.rs
@@ -93,12 +93,7 @@ impl HomeserverConfig {
                     )
                     .await?;
 
-                HomeserverDiscoveryResult {
-                    server: Some(server),
-                    homeserver,
-                    well_known,
-                    supported_versions,
-                }
+                HomeserverDiscoveryResult { server, homeserver, well_known, supported_versions }
             }
         })
     }
@@ -111,7 +106,12 @@ async fn discover_homeserver_from_server_name_or_url(
     mut server_name_or_url: String,
     http_client: &HttpClient,
 ) -> Result<
-    (Url, Url, Option<discover_homeserver::Response>, Option<get_supported_versions::Response>),
+    (
+        Option<Url>,
+        Url,
+        Option<discover_homeserver::Response>,
+        Option<get_supported_versions::Response>,
+    ),
     ClientBuildError,
 > {
     let mut discovery_error: Option<ClientBuildError> = None;
@@ -129,7 +129,7 @@ async fn discover_homeserver_from_server_name_or_url(
         match discover_homeserver(server_name, &protocol, http_client).await {
             Ok((server, well_known)) => {
                 return Ok((
-                    server,
+                    Some(server),
                     Url::parse(&well_known.homeserver.base_url)?,
                     Some(well_known),
                     None,
@@ -154,7 +154,7 @@ async fn discover_homeserver_from_server_name_or_url(
         // Make sure the URL is definitely for a homeserver.
         match get_supported_versions(&homeserver_url, http_client).await {
             Ok(response) => {
-                return Ok((homeserver_url.clone(), homeserver_url, None, Some(response)));
+                return Ok((None, homeserver_url, None, Some(response)));
             }
             Err(e) => {
                 debug!(error = %e, "Checking supported versions failed.");
@@ -325,7 +325,7 @@ mod tests {
             .await
             .unwrap();
 
-        assert_eq!(result.server, Some(Url::parse(&homeserver.uri()).unwrap()));
+        assert!(result.server.is_none());
         assert_eq!(result.homeserver, Url::parse(&homeserver.uri()).unwrap());
         assert!(result.well_known.is_none());
         assert!(result.supported_versions.is_some());