diff --git a/CHANGELOG b/CHANGELOG
index 9a312cfdf1..dc0f503241 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
 v3.3.18 (XXXX-XX-XX)
 --------------------
 
+* fix internal issue #2957: the Web UI was not able to display more than 1000
+  documents, even when it was set to a higher amount.
+
 * fix internal issue #2785: web ui's sort dialog sometimes got rendered, even
   if it should not.
 
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoDocuments.js b/js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoDocuments.js
index db7001ae6c..d020612253 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoDocuments.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoDocuments.js
@@ -183,10 +183,16 @@
       var bindVars;
       var tmp;
       var queryObj;
+
+      var pageSize = this.getPageSize();
+      if (pageSize === 'all') {
+        pageSize = this.MAX_SORT + 38000; // will result in 50k docs
+      }
+
       bindVars = {
         '@collection': this.collectionID,
         'offset': this.getOffset(),
-        'count': this.getPageSize()
+        'count': pageSize
       };
 
       // fetch just the first 25 attributes of the document
@@ -215,7 +221,8 @@
 
       queryObj = {
         query: query,
-        bindVars: bindVars
+        bindVars: bindVars,
+        batchSize: pageSize
       };
 
       if (this.filters.length > 0) {