diff --git a/cmd/gateway-s3.go b/cmd/gateway-s3.go
index dd1e59493..7c4c8aa9f 100644
--- a/cmd/gateway-s3.go
+++ b/cmd/gateway-s3.go
@@ -99,6 +99,11 @@ type s3Gateway struct {
 
 // newS3Gateway returns s3 gatewaylayer
 func newS3Gateway(endpoint string, accessKey, secretKey string, secure bool) (GatewayLayer, error) {
+	if endpoint == "" {
+		endpoint = "s3.amazonaws.com"
+		secure = true
+	}
+
 	// Initialize minio client object.
 	client, err := minio.NewCore(endpoint, accessKey, secretKey, secure)
 	if err != nil {