diff --git a/pkg/api/server.go b/pkg/api/server.go
index b9a48e60c..0cde14fb4 100644
--- a/pkg/api/server.go
+++ b/pkg/api/server.go
@@ -352,7 +352,7 @@ func BaseURLMiddleware(next http.Handler) http.Handler {
 
 		port := ""
 		forwardedPort := r.Header.Get("X-Forwarded-Port")
-		if forwardedPort != "" && forwardedPort != "80" && forwardedPort != "8080" {
+		if forwardedPort != "" && forwardedPort != "80" && forwardedPort != "8080" && forwardedPort != "443" && !strings.Contains(r.Host, ":") {
 			port = ":" + forwardedPort
 		}