diff --git a/lib/pulsar/db.js b/lib/pulsar/db.js
index <HASH>..<HASH> 100644
--- a/lib/pulsar/db.js
+++ b/lib/pulsar/db.js
@@ -73,7 +73,7 @@ module.exports = (function() {
     this.collection
       .find({}, {"sort": [['data.timestamp', 'desc']]})
       .skip(currentPage * pageSize)
-      .limit(pageSize)
+      .limit(pageSize || 0)
       .toArray(function(err, resultList) {
         if (!err) {
           resultList = _.map(resultList, function(result) {
Fix error due to mongodb client upgrade