diff --git a/clientapi/routing/routing.go b/clientapi/routing/routing.go
index 72b43a8b8..d59b6f666 100644
--- a/clientapi/routing/routing.go
+++ b/clientapi/routing/routing.go
@@ -44,6 +44,19 @@ import (
 	"github.com/matrix-org/dendrite/setup/jetstream"
 )
 
+type WellKnownClientHomeserver struct {
+	BaseUrl string `json:"base_url"`
+}
+
+type WellKnownSlidingSyncProxy struct {
+	Url string `json:"url"`
+}
+
+type WellKnownClientResponse struct {
+	HomeserverName   WellKnownClientHomeserver  `json:"m.homeserver"`
+	SlidingSyncProxy *WellKnownSlidingSyncProxy `json:"org.matrix.msc3575.proxy,omitempty"`
+}
+
 // Setup registers HTTP handlers with the given ServeMux. It also supplies the given http.Client
 // to clients which need to make outbound HTTP requests.
 //
@@ -98,48 +111,22 @@ func Setup(
 		logrus.Infof("Setting m.homeserver base_url as %s at /.well-known/matrix/client", cfg.Matrix.WellKnownClientName)
 		if cfg.Matrix.WellKnownSlidingSyncProxy != "" {
 			logrus.Infof("Setting org.matrix.msc3575.proxy url as %s at /.well-known/matrix/client", cfg.Matrix.WellKnownSlidingSyncProxy)
-			wkMux.Handle("/client", httputil.MakeExternalAPI("wellknown", func(r *http.Request) util.JSONResponse {
-				return util.JSONResponse{
-					Code: http.StatusOK,
-					JSON: struct {
-						HomeserverName struct {
-							BaseUrl string `json:"base_url"`
-						} `json:"m.homeserver"`
-						SlidingSyncProxy struct {
-							Url string `json:"url"`
-						} `json:"org.matrix.msc3575.proxy"`
-					}{
-						HomeserverName: struct {
-							BaseUrl string `json:"base_url"`
-						}{
-							BaseUrl: cfg.Matrix.WellKnownClientName,
-						},
-						SlidingSyncProxy: struct {
-							Url string `json:"url"`
-						}{
-							Url: cfg.Matrix.WellKnownSlidingSyncProxy,
-						},
-					},
-				}
-			})).Methods(http.MethodGet, http.MethodOptions)
-		} else {
-			wkMux.Handle("/client", httputil.MakeExternalAPI("wellknown", func(r *http.Request) util.JSONResponse {
-				return util.JSONResponse{
-					Code: http.StatusOK,
-					JSON: struct {
-						HomeserverName struct {
-							BaseUrl string `json:"base_url"`
-						} `json:"m.homeserver"`
-					}{
-						HomeserverName: struct {
-							BaseUrl string `json:"base_url"`
-						}{
-							BaseUrl: cfg.Matrix.WellKnownClientName,
-						},
-					},
-				}
-			})).Methods(http.MethodGet, http.MethodOptions)
 		}
+		wkMux.Handle("/client", httputil.MakeExternalAPI("wellknown", func(r *http.Request) util.JSONResponse {
+			response := WellKnownClientResponse{
+				HomeserverName: WellKnownClientHomeserver{cfg.Matrix.WellKnownClientName},
+			}
+			if cfg.Matrix.WellKnownSlidingSyncProxy != "" {
+				response.SlidingSyncProxy = &WellKnownSlidingSyncProxy{
+					Url: cfg.Matrix.WellKnownSlidingSyncProxy,
+				}
+			}
+
+			return util.JSONResponse{
+				Code: http.StatusOK,
+				JSON: response,
+			}
+		})).Methods(http.MethodGet, http.MethodOptions)
 	}
 
 	publicAPIMux.Handle("/versions",