diff --git a/src/eventlog.js b/src/eventlog.js
index 353401520..4dbccd8c5 100644
--- a/src/eventlog.js
+++ b/src/eventlog.js
@@ -6,7 +6,6 @@ exports = module.exports = {
     add: add,
     get: get,
     getAllPaged: getAllPaged,
-    getByQueryPaged: getByQueryPaged,
 
     // keep in sync with webadmin index.js filter
     ACTION_ACTIVATE: 'cloudron.activate',
@@ -87,26 +86,14 @@ function get(id, callback) {
     });
 }
 
-function getAllPaged(page, perPage, callback) {
-    assert.strictEqual(typeof page, 'number');
-    assert.strictEqual(typeof perPage, 'number');
-    assert.strictEqual(typeof callback, 'function');
-
-    eventlogdb.getAllPaged(page, perPage, function (error, boxes) {
-        if (error) return callback(new EventLogError(EventLogError.INTERNAL_ERROR, error));
-
-        callback(null, boxes);
-    });
-}
-
-function getByQueryPaged(action, search, page, perPage, callback) {
+function getAllPaged(action, search, page, perPage, callback) {
     assert(typeof action === 'string' || action === null);
     assert(typeof search === 'string' || search === null);
     assert.strictEqual(typeof page, 'number');
     assert.strictEqual(typeof perPage, 'number');
     assert.strictEqual(typeof callback, 'function');
 
-    eventlogdb.getByQueryPaged(action, search, page, perPage, function (error, boxes) {
+    eventlogdb.getAllPaged(action, search, page, perPage, function (error, boxes) {
         if (error) return callback(new EventLogError(EventLogError.INTERNAL_ERROR, error));
 
         callback(null, boxes);
diff --git a/src/eventlogdb.js b/src/eventlogdb.js
index 8008b93e2..c4fc565f6 100644
--- a/src/eventlogdb.js
+++ b/src/eventlogdb.js
@@ -3,7 +3,6 @@
 exports = module.exports = {
     get: get,
     getAllPaged: getAllPaged,
-    getByQueryPaged: getByQueryPaged,
     add: add,
     count: count,
 
@@ -37,21 +36,7 @@ function get(eventId, callback) {
     });
 }
 
-function getAllPaged(page, perPage, callback) {
-    assert.strictEqual(typeof page, 'number');
-    assert.strictEqual(typeof perPage, 'number');
-    assert.strictEqual(typeof callback, 'function');
-
-    database.query('SELECT ' + EVENTLOGS_FIELDS + ' FROM eventlog ORDER BY creationTime DESC LIMIT ?,?', [ (page-1)*perPage, perPage ], function (error, results) {
-        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
-
-        results.forEach(postProcess);
-
-        callback(null, results);
-    });
-}
-
-function getByQueryPaged(action, search, page, perPage, callback) {
+function getAllPaged(action, search, page, perPage, callback) {
     assert(typeof action === 'string' || action === null);
     assert(typeof search === 'string' || search === null);
     assert.strictEqual(typeof page, 'number');
diff --git a/src/routes/eventlog.js b/src/routes/eventlog.js
index a1e8d413f..34299b636 100644
--- a/src/routes/eventlog.js
+++ b/src/routes/eventlog.js
@@ -18,17 +18,9 @@ function get(req, res, next) {
     if (req.query.action && typeof req.query.action !== 'string') return next(new HttpError(400, 'action must be a string'));
     if (req.query.search && typeof req.query.search !== 'string') return next(new HttpError(400, 'search must be a string'));
 
-    if (req.query.action || req.query.search) {
-        eventlog.getByQueryPaged(req.query.action || null, req.query.search || null, page, perPage, function (error, result) {
-            if (error) return next(new HttpError(500, error));
+    eventlog.getAllPaged(req.query.action || null, req.query.search || null, page, perPage, function (error, result) {
+        if (error) return next(new HttpError(500, error));
 
-            next(new HttpSuccess(200, { eventlogs: result }));
-        });
-    } else {
-        eventlog.getAllPaged(page, perPage, function (error, result) {
-            if (error) return next(new HttpError(500, error));
-
-            next(new HttpSuccess(200, { eventlogs: result }));
-        });
-    }
+        next(new HttpSuccess(200, { eventlogs: result }));
+    });
 }
diff --git a/src/test/database-test.js b/src/test/database-test.js
index 816b6e02c..bcb671f81 100644
--- a/src/test/database-test.js
+++ b/src/test/database-test.js
@@ -1109,7 +1109,7 @@ describe('database', function () {
         });
 
         it('getAllPaged succeeds', function (done) {
-            eventlogdb.getAllPaged(1, 1, function (error, results) {
+            eventlogdb.getAllPaged(null, null, 1, 1, function (error, results) {
                 expect(error).to.be(null);
                 expect(results).to.be.an(Array);
                 expect(results.length).to.be(1);