diff --git a/modules/editor/editor.model.php b/modules/editor/editor.model.php
index c350d9e55..84f5b87c5 100644
--- a/modules/editor/editor.model.php
+++ b/modules/editor/editor.model.php
@@ -305,6 +305,8 @@ class editorModel extends editor
 			$file_config = $oFileModel->getUploadConfig();
 			$file_config->allowed_attach_size = $file_config->allowed_attach_size*1024*1024;
 			$file_config->allowed_filesize = $file_config->allowed_filesize*1024*1024;
+			$file_config->allowed_chunk_size = min(FileHandler::returnBytes(ini_get('upload_max_filesize')), FileHandler::returnBytes(ini_get('post_max_size')) * 0.95, 100 * 1024 * 1024);
+			$file_config->allowed_chunk_size = floor($file_config->allowed_chunk_size / 131072) * 131072;
 
 			Context::set('file_config',$file_config);
 			// Configure upload status such as file size
diff --git a/modules/editor/skins/ckeditor/file_upload.html b/modules/editor/skins/ckeditor/file_upload.html
index d15304289..918b6b69d 100644
--- a/modules/editor/skins/ckeditor/file_upload.html
+++ b/modules/editor/skins/ckeditor/file_upload.html
@@ -56,7 +56,7 @@
 		// uploader
 		var setting = {
 			maxFileSize: {$file_config->allowed_filesize},
-			maxChunkSize: 0,
+			maxChunkSize: {$file_config->allowed_chunk_size},
 			singleFileUploads: true
 		};
 		$container = $('#xefu-container-{$editor_sequence}');