diff --git a/main.go b/main.go
index 96c1fa0..ff4a8bc 100644
--- a/main.go
+++ b/main.go
@@ -288,8 +288,15 @@ func main() {
 	if err != nil {
 		log.Fatal(err)
 	}
+
+	clientWellKnown, err := mautrix.DiscoverClientAPI(context.Background(), homeserver)
+	if err != nil {
+		log.Fatal(err)
+	}
+	homeserverURL := clientWellKnown.Homeserver.BaseURL
+
 	client, err := mautrix.NewClient(
-		homeserver,
+		homeserverURL,
 		userId,
 		config.Token,
 	)