diff --git a/src/main/java/org/pytorch/serve/plugins/dragonfly/objectstorage/S3.java b/src/main/java/org/pytorch/serve/plugins/dragonfly/objectstorage/S3.java
index 81d6524..7a23f14 100644
--- a/src/main/java/org/pytorch/serve/plugins/dragonfly/objectstorage/S3.java
+++ b/src/main/java/org/pytorch/serve/plugins/dragonfly/objectstorage/S3.java
@@ -41,7 +41,7 @@ public S3(ObjectStorageConfig objectStorageConfig) {
     builder.region(region);
     builder.credentialsProvider(StaticCredentialsProvider.create(awsCreds));
 
-    if (endpoint == null || endpoint.isEmpty()) {
+    if (endpoint != null && !endpoint.isEmpty()) {
       builder.endpointOverride(URI.create(endpoint));
     }