diff --git a/packages/rocketchat-file-upload/ufs/AmazonS3/server.js b/packages/rocketchat-file-upload/ufs/AmazonS3/server.js
index f69b05a883c..048732e8838 100644
--- a/packages/rocketchat-file-upload/ufs/AmazonS3/server.js
+++ b/packages/rocketchat-file-upload/ufs/AmazonS3/server.js
@@ -137,7 +137,8 @@ export class AmazonS3Store extends UploadFS.Store {
 			s3.putObject({
 				Key: this.getPath(file),
 				Body: writeStream,
-				ContentType: file.type
+				ContentType: file.type,
+				ContentDisposition: `inline; filename=${ file.name }`
 
 			}, (error) => {
 				if (error) {