diff --git a/src/storage/s3.js b/src/storage/s3.js
index 5b3798274..cf671dd99 100644
--- a/src/storage/s3.js
+++ b/src/storage/s3.js
@@ -72,7 +72,7 @@ function getS3Config(apiConfig) {
         },
         httpOptions: {
             connectTimeout: 60000, // https://github.com/aws/aws-sdk-js/pull/1446
-            timeout: 0 // https://github.com/aws/aws-sdk-js/issues/1704 (allow unlimited time for chunk upload)
+            timeout: 20 * 60 * 1000 // https://github.com/aws/aws-sdk-js/issues/1704
         }
     };