diff --git a/CHANGES b/CHANGES
index dfb809c98..b49a2f796 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2131,5 +2131,5 @@
 * rsync: add warning to remove lifecycle rules
 * Add volume management
 * backups: adjust node's heap size based on memory limit
-* s3: each chunk can take up to 30 mins to upload
+* s3: diasble per-chunk timeout
 
diff --git a/src/storage/s3.js b/src/storage/s3.js
index d83b03d9c..86bb4d6a4 100644
--- a/src/storage/s3.js
+++ b/src/storage/s3.js
@@ -62,13 +62,13 @@ function getS3Config(apiConfig, callback) {
         accessKeyId: apiConfig.accessKeyId,
         secretAccessKey: apiConfig.secretAccessKey,
         region: apiConfig.region || 'us-east-1',
-        maxRetries: 5,
+        maxRetries: 10,
         retryDelayOptions: {
             customBackoff: () => 20000 // constant backoff - https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/Config.html#retryDelayOptions-property
         },
         httpOptions: {
             connectTimeout: 20000, // https://github.com/aws/aws-sdk-js/pull/1446
-            timeout: 3000 * 1000 // https://github.com/aws/aws-sdk-js/issues/1704 (allow chunk upload to take upto 30 minutes)
+            timeout: 0 // https://github.com/aws/aws-sdk-js/issues/1704 (allow unlimited time for chunk upload)
         }
     };