diff --git a/src/baseclient.cc b/src/baseclient.cc
index 3949098b..7dd8cb6e 100644
--- a/src/baseclient.cc
+++ b/src/baseclient.cc
@@ -936,7 +936,8 @@ minio::s3::BaseClient::GetPresignedObjectUrl(GetPresignedObjectUrlArgs args) {
     utils::Time date = utils::Time::Now();
     if (args.request_time) date = args.request_time;
 
-    signer::PresignV4(args.method, url.host, url.path, region, query_params,
+    std::string host = url.HostHeaderValue();
+    signer::PresignV4(args.method, host, url.path, region, query_params,
                       creds.access_key, creds.secret_key, date,
                       args.expiry_seconds);
     url.query_string = query_params.ToQueryString();
diff --git a/src/request.cc b/src/request.cc
index 1d883ca9..adb71886 100644
--- a/src/request.cc
+++ b/src/request.cc
@@ -243,7 +243,7 @@ minio::s3::Request::Request(http::Method method, std::string region,
 
 void minio::s3::Request::BuildHeaders(http::Url& url,
                                       creds::Provider* provider) {
-  headers.Add("Host", url.host);
+  headers.Add("Host", url.HostHeaderValue());
   headers.Add("User-Agent", user_agent);
 
   bool md5sum_added = headers.Contains("Content-MD5");