diff --git a/packages/rocketchat-file-upload/server/config/AmazonS3.js b/packages/rocketchat-file-upload/server/config/AmazonS3.js
index 571d59246510..04026ddd7da2 100644
--- a/packages/rocketchat-file-upload/server/config/AmazonS3.js
+++ b/packages/rocketchat-file-upload/server/config/AmazonS3.js
@@ -69,14 +69,12 @@ const configure = _.debounce(function() {
 	// const CDN = RocketChat.settings.get('FileUpload_S3_CDN');
 	const BucketURL = RocketChat.settings.get('FileUpload_S3_BucketURL');
 
-	if (!Bucket || !AWSAccessKeyId || !AWSSecretAccessKey) {
+	if (!Bucket) {
 		return;
 	}
 
 	const config = {
 		connection: {
-			accessKeyId: AWSAccessKeyId,
-			secretAccessKey: AWSSecretAccessKey,
 			signatureVersion: SignatureVersion,
 			s3ForcePathStyle: ForcePathStyle,
 			params: {
@@ -88,6 +86,14 @@ const configure = _.debounce(function() {
 		URLExpiryTimeSpan
 	};
 
+	if (AWSAccessKeyId) {
+		config.connection.accessKeyId = AWSAccessKeyId;
+	}
+
+	if (AWSSecretAccessKey) {
+		config.connection.secretAccessKey = AWSSecretAccessKey;
+	}
+
 	if (BucketURL) {
 		config.connection.endpoint = BucketURL;
 	}