diff --git a/server/utils/s3.js b/server/utils/s3.js
index 61c78cb92..7cb294a01 100644
--- a/server/utils/s3.js
+++ b/server/utils/s3.js
@@ -17,7 +17,11 @@ const s3 = new AWS.S3({
   accessKeyId: AWS_ACCESS_KEY_ID,
   secretAccessKey: AWS_SECRET_ACCESS_KEY,
   region: AWS_REGION,
-  endpoint: new AWS.Endpoint(process.env.AWS_S3_UPLOAD_BUCKET_URL),
+  endpoint: process.env.AWS_S3_UPLOAD_BUCKET_URL.includes(
+    AWS_S3_UPLOAD_BUCKET_NAME
+  )
+    ? undefined
+    : new AWS.Endpoint(process.env.AWS_S3_UPLOAD_BUCKET_URL),
   signatureVersion: "v4",
 });