diff --git a/Minio/AWSS3Endpoints.cs b/Minio/AWSS3Endpoints.cs
deleted file mode 100644
index 40cc2c5d2..000000000
--- a/Minio/AWSS3Endpoints.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * MinIO .NET Library for Amazon S3 Compatible Cloud Storage, (C) 2017 MinIO, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-using System.Collections.Concurrent;
-
-namespace Minio;
-
-/// <summary>
-///     Amazon AWS S3 endpoints for various regions.
-/// </summary>
-public sealed class AWSS3Endpoints
-{
-    private static readonly Lazy<AWSS3Endpoints> lazy = new(() => new AWSS3Endpoints());
-
-    private readonly ConcurrentDictionary<string, string> endpoints;
-
-    private AWSS3Endpoints()
-    {
-        endpoints = new ConcurrentDictionary<string, string>(StringComparer.Ordinal);
-        // ap-northeast-1
-        _ = endpoints.TryAdd("ap-northeast-1", "s3-ap-northeast-1.amazonaws.com");
-        // ap-northeast-2
-        _ = endpoints.TryAdd("ap-northeast-2", "s3-ap-northeast-2.amazonaws.com");
-        // ap-south-1
-        _ = endpoints.TryAdd("ap-south-1", "s3-ap-south-1.amazonaws.com");
-        // ap-southeast-1
-        _ = endpoints.TryAdd("ap-southeast-1", "s3-ap-southeast-1.amazonaws.com");
-        // ap-southeast-2
-        _ = endpoints.TryAdd("ap-southeast-2", "s3-ap-southeast-2.amazonaws.com");
-        // eu-central-1
-        _ = endpoints.TryAdd("eu-central-1", "s3-eu-central-1.amazonaws.com");
-        // eu-west-1
-        _ = endpoints.TryAdd("eu-west-1", "s3-eu-west-1.amazonaws.com");
-        // eu-west-2
-        _ = endpoints.TryAdd("eu-west-2", "s3-eu-west-2.amazonaws.com");
-        // sa-east-1
-        _ = endpoints.TryAdd("sa-east-1", "s3-sa-east-1.amazonaws.com");
-        // us-west-1
-        _ = endpoints.TryAdd("us-west-1", "s3-us-west-1.amazonaws.com");
-        // us-west-2
-        _ = endpoints.TryAdd("us-west-2", "s3-us-west-2.amazonaws.com");
-        // us-east-1
-        _ = endpoints.TryAdd("us-east-1", "s3.amazonaws.com");
-        // us-east-2
-        _ = endpoints.TryAdd("us-east-2", "s3-us-east-2.amazonaws.com");
-        // ca-central-1
-        _ = endpoints.TryAdd("ca-central-1", "s3.ca-central-1.amazonaws.com");
-        // cn-north-1
-        _ = endpoints.TryAdd("cn-north-1", "s3.cn-north-1.amazonaws.com.cn");
-    }
-
-    public static AWSS3Endpoints Instance => lazy.Value;
-
-    /// <summary>
-    ///     Gets Amazon S3 endpoint for the relevant region.
-    /// </summary>
-    /// <param name="region"></param>
-    /// <returns></returns>
-    public static string Endpoint(string region)
-    {
-        string endpoint = null;
-        if (region is not null) _ = Instance.endpoints.TryGetValue(region, out endpoint);
-        endpoint ??= "s3.amazonaws.com";
-        return endpoint;
-    }
-}
diff --git a/Minio/Helper/RequestUtil.cs b/Minio/Helper/RequestUtil.cs
index 78d9cfae8..67cac5d3b 100644
--- a/Minio/Helper/RequestUtil.cs
+++ b/Minio/Helper/RequestUtil.cs
@@ -51,9 +51,8 @@ internal static Uri MakeTargetURL(string endPoint, bool secure, string bucketNam
     {
         // For Amazon S3 endpoint, try to fetch location based endpoint.
         var host = endPoint;
-        if (S3utils.IsAmazonEndPoint(endPoint))
-            // Fetch new host based on the bucket location.
-            host = AWSS3Endpoints.Endpoint(region);
+        if (S3utils.IsAmazonEndPoint(endPoint) && !string.IsNullOrEmpty(region))
+            host = $"s3.{region}.amazonaws.com";
 
         if (!usePathStyle)
         {