diff --git a/s3/s3.go b/s3/s3.go
index 509549a60f8f2764034748f7c1cd6ac908639b40..dcf773d1f7f8d0341e2594607120776e374b91e5 100644
--- a/s3/s3.go
+++ b/s3/s3.go
@@ -498,18 +498,15 @@ func (s ClientWithHelpers) DeleteObjectFromBucket(bucket string, fileName string
 func GetS3FileKey(fileName string, folder string) string {
 	var fileKey string
 
-	// Trim leading and trailing slashes
-	fileName = strings.TrimLeft(fileName, "/")
-	fileName = strings.TrimRight(fileName, "/")
+	fileName = strings.Trim(fileName, "/")
+	folder = strings.Trim(folder, "/")
 
 	if folder != "" {
-		folder = strings.TrimLeft(folder, "/")
-		folder = strings.TrimRight(folder, "/")
-		fileKey += "/" + folder
+		fileKey = fileName + "/" + folder
+	} else {
+		fileKey = fileName
 	}
 
-	fileKey += "/" + fileName
-
 	return fileKey
 }