diff --git a/src/Controllers/DatabaseController.js b/src/Controllers/DatabaseController.js
index 91507ef83c..f7166c672e 100644
--- a/src/Controllers/DatabaseController.js
+++ b/src/Controllers/DatabaseController.js
@@ -501,6 +501,7 @@ DatabaseController.prototype.find = function(className, query, options = {}) {
       mongoWhere = {'$and': [mongoWhere, {'$or': orParts}]};
     }
     if (options.count) {
+      delete mongoOptions.limit;
       return collection.count(mongoWhere, mongoOptions);
     } else {
       return collection.find(mongoWhere, mongoOptions)