diff --git a/crates/matrix-sdk/src/client/builder.rs b/crates/matrix-sdk/src/client/builder.rs
index 3ddbc7b1c..658828329 100644
--- a/crates/matrix-sdk/src/client/builder.rs
+++ b/crates/matrix-sdk/src/client/builder.rs
@@ -458,11 +458,8 @@ impl ClientBuilder {
                     }
                 }
 
-                if let Some(homeserver_details) = homeserver_details {
-                    homeserver_details
-                } else {
-                    Err(discovery_error.unwrap_or(ClientBuildError::InvalidServerName))?
-                }
+                homeserver_details
+                    .ok_or(discovery_error.unwrap_or(ClientBuildError::InvalidServerName))?
             }
         };