diff --git a/cmd/api-router.go b/cmd/api-router.go
index 59e05909e..0d74276e1 100644
--- a/cmd/api-router.go
+++ b/cmd/api-router.go
@@ -17,7 +17,6 @@
 package cmd
 
 import (
-	"net"
 	"net/http"
 
 	"github.com/gorilla/mux"
@@ -46,13 +45,8 @@ func registerAPIRouter(router *mux.Router, encryptionEnabled bool) {
 	apiRouter := router.PathPrefix("/").Subrouter()
 	var routers []*mux.Router
 	for _, domainName := range globalDomainNames {
-		var hostPort string
-		if globalMinioPort != "443" && globalMinioPort != "80" {
-			hostPort = net.JoinHostPort(domainName, globalMinioPort)
-		} else {
-			hostPort = domainName
-		}
-		routers = append(routers, apiRouter.Host("{bucket:.+}."+hostPort).Subrouter())
+		routers = append(routers, apiRouter.Host("{bucket:.+}."+domainName).Subrouter())
+		routers = append(routers, apiRouter.Host("{bucket:.+}."+domainName+":{port:.*}").Subrouter())
 	}
 	routers = append(routers, apiRouter.PathPrefix("/{bucket}").Subrouter())