diff --git a/modules/core/src/com/haulmont/cuba/core/app/filestorage/amazon/AmazonS3FileStorage.java b/modules/core/src/com/haulmont/cuba/core/app/filestorage/amazon/AmazonS3FileStorage.java
index b3138890df..96c7e66c18 100644
--- a/modules/core/src/com/haulmont/cuba/core/app/filestorage/amazon/AmazonS3FileStorage.java
+++ b/modules/core/src/com/haulmont/cuba/core/app/filestorage/amazon/AmazonS3FileStorage.java
@@ -89,7 +89,7 @@ public class AmazonS3FileStorage implements FileStorageAPI {
 
             // get the request stream and start writing the user data as chunks, as outlined
             // above;
-            byte[] buffer = new byte[4096];
+            byte[] buffer = new byte[amazonConfiguration.getChunkSize()];
             DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream());
 
             int bytesRead;