diff --git a/src/api/server/well_known.rs b/src/api/server/well_known.rs
index 75c7cf5dd..c8d1c6234 100644
--- a/src/api/server/well_known.rs
+++ b/src/api/server/well_known.rs
@@ -1,6 +1,6 @@
 use axum::extract::State;
-use conduwuit::{Error, Result};
-use ruma::api::{client::error::ErrorKind, federation::discovery::discover_homeserver};
+use conduwuit::{Err, Result};
+use ruma::api::federation::discovery::discover_homeserver;
 
 use crate::Ruma;
 
@@ -11,10 +11,10 @@ pub(crate) async fn well_known_server(
 	State(services): State<crate::State>,
 	_body: Ruma<discover_homeserver::Request>,
 ) -> Result<discover_homeserver::Response> {
-	Ok(discover_homeserver::Response {
-		server: match services.server.config.well_known.server.as_ref() {
+	Ok(discover_homeserver::Response::new(
+		match services.server.config.well_known.server.as_ref() {
 			| Some(server_name) => server_name.to_owned(),
-			| None => return Err(Error::BadRequest(ErrorKind::NotFound, "Not found.")),
+			| None => return Err!(Request(NotFound("No well-known server URL is configured."))),
 		},
-	})
+	))
 }