diff --git a/Cargo.toml b/Cargo.toml
index 9da40445..ee1a425d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,8 +22,12 @@ ruma-identifiers = "0.12.0"
 ruma-signatures = "0.4.2"
 serde_json = "1.0.39"
 serde_urlencoded = "0.5.4"
-url = "1.7.2"
+url_serde = "0.2.0"
 
 [dependencies.serde]
 version = "1.0.90"
 features = ["derive"]
+
+[dependencies.url]
+version = "1.7.2"
+features = ["serde"]
diff --git a/src/unversioned/discover_homeserver.rs b/src/unversioned/discover_homeserver.rs
index 73e222dc..5070419b 100644
--- a/src/unversioned/discover_homeserver.rs
+++ b/src/unversioned/discover_homeserver.rs
@@ -8,6 +8,7 @@ use url::Url;
 #[derive(Clone, Debug, Deserialize, Hash, PartialEq, PartialOrd, Serialize)]
 pub struct HomeserverInfo {
     /// The base URL for the homeserver for client-server connections.
+    #[serde(with = "url_serde")]
     pub base_url: Url,
 }
 
@@ -15,6 +16,7 @@ pub struct HomeserverInfo {
 #[derive(Clone, Debug, Deserialize, Hash, PartialEq, PartialOrd, Serialize)]
 pub struct IdentityServerInfo {
     /// The base URL for the identity server for client-server connections.
+    #[serde(with = "url_serde")]
     pub base_url: Url,
 }