diff --git a/pkg/api/server.go b/pkg/api/server.go
index c06a24120..e92c3824f 100644
--- a/pkg/api/server.go
+++ b/pkg/api/server.go
@@ -384,13 +384,7 @@ func BaseURLMiddleware(next http.Handler) http.Handler {
 		}
 		prefix := getProxyPrefix(r.Header)
 
-		port := ""
-		forwardedPort := r.Header.Get("X-Forwarded-Port")
-		if forwardedPort != "" && forwardedPort != "80" && forwardedPort != "8080" && forwardedPort != "443" && !strings.Contains(r.Host, ":") {
-			port = ":" + forwardedPort
-		}
-
-		baseURL := scheme + "://" + r.Host + port + prefix
+		baseURL := scheme + "://" + r.Host + prefix
 
 		externalHost := config.GetInstance().GetExternalHost()
 		if externalHost != "" {