@@ -61,13 +61,15 @@ } else {
 		config.Domains = []string{runtimeConfig.ListenAddress}
 	}
 	scheme := "http"
+	port := runtimeConfig.Port
 	if runtimeConfig.TLS {
 		scheme = "https"
+		port = runtimeConfig.TLSPort
 	}
 	config.BaseURL = cfg.URL{
 		URL: &url.URL{
 			Scheme: scheme,
-			Host:   runtimeConfig.ListenAddress,
+			Host:   net.JoinHostPort(config.Domains[0], strconv.Itoa(port)),
 		},
 	}
 }