diff --git a/README.md b/README.md
index 0034c78f..7644d58a 100644
--- a/README.md
+++ b/README.md
@@ -67,6 +67,7 @@ Easy to use Angular2 directives for files upload ([demo](http://valor-software.g
   5. `formatDataFunction` - Function to modify the request body. 'DisableMultipart' must be 'true' for this function to be called.
   6. `formatDataFunctionIsAsync` - Informs if the function sent in 'formatDataFunction' is asynchronous. Defaults to false.
   7. `parametersBeforeFiles` - States if additional parameters should be appended before or after the file. Defaults to false.
+  8. `queueMaxSizeLimit` - States the maximum allowed size (in bytes) of all files in the queue that are going to be uploaded.
 
 ### Events
 
diff --git a/libs/ng2-file-upload/file-upload/file-uploader.class.ts b/libs/ng2-file-upload/file-upload/file-uploader.class.ts
index 52fb4536..beca018a 100644
--- a/libs/ng2-file-upload/file-upload/file-uploader.class.ts
+++ b/libs/ng2-file-upload/file-upload/file-uploader.class.ts
@@ -30,6 +30,7 @@ export interface FileUploaderOptions {
   authToken?: string;
   maxFileSize?: number;
   queueLimit?: number;
+  queueMaxSizeLimit? : number;
   removeAfterUpload?: boolean;
   url: string;
   disableMultipart?: boolean;
@@ -79,6 +80,10 @@ export class FileUploader {
     this.autoUpload = this.options.autoUpload;
     this.options.filters?.unshift({ name: 'queueLimit', fn: this._queueLimitFilter });
 
+    if (this.options.queueMaxSizeLimit) {
+      this.options.filters?.unshift({ name: 'queueMaxSizeLimit', fn: this._queueMaxSizeLimitFilter });
+    }
+
     if (this.options.maxFileSize) {
       this.options.filters?.unshift({ name: 'fileSize', fn: this._fileSizeFilter });
     }
@@ -430,6 +435,17 @@ export class FileUploader {
     return this.options.queueLimit === undefined || this.queue.length < this.options.queueLimit;
   }
 
+  protected _queueMaxSizeLimitFilter(item: FileLikeObject): boolean {    
+    let queueFileSize = 0;    
+    let queueNotProcessedItems = this.queue.filter(queuedItem => !(queuedItem.isSuccess || queuedItem.isCancel || queuedItem.isError));
+    if(queueNotProcessedItems.length>0)
+    {
+      // total size of all queued items that are going to be uploaded
+      queueFileSize = queueNotProcessedItems.map(queuedItem => queuedItem.file.size).reduce((fileSizeA,fileSizeB)=> fileSizeA + fileSizeB);
+    }
+    return this.options.queueMaxSizeLimit === undefined || (queueFileSize + item.size) < this.options.queueMaxSizeLimit;
+  }
+
   protected _isValidFile(file: FileLikeObject, filters: FilterFunction[], options: FileUploaderOptions): boolean {
     this._failFilterIndex = -1;
 
diff --git a/libs/ng2-file-upload/testing/spec/file-select.directive.spec.ts b/libs/ng2-file-upload/testing/spec/file-select.directive.spec.ts
index 9b30574a..b99472a5 100644
--- a/libs/ng2-file-upload/testing/spec/file-select.directive.spec.ts
+++ b/libs/ng2-file-upload/testing/spec/file-select.directive.spec.ts
@@ -64,6 +64,7 @@ describe('Directive: FileSelectDirective', () => {
       expect(options.isHTML5).toBeTruthy();
       expect(options.removeAfterUpload).toBeFalsy();
       expect(options.disableMultipart).toBeFalsy();
+      expect(options.queueMaxSizeLimit).toBeUndefined();
     }
 
   });