diff --git a/src/client/components/index.js b/src/client/components/index.js
index 61586c671f..ceb5f30f7c 100644
--- a/src/client/components/index.js
+++ b/src/client/components/index.js
@@ -3,7 +3,7 @@ import { render } from 'react-dom';
 import { BrowserRouter as Router } from 'react-router-dom';
 import { SearchParamsProvider } from './utilities/SearchParams';
 import { LocaleProvider } from './utilities/Locale';
-import StatusList, { StatusListProvider } from './modules/Status';
+import { StatusListProvider } from './modules/Status';
 import { UserProvider } from './data/User';
 import Routes from './Routes';
 
diff --git a/src/mongoose/requestHandlers/query.js b/src/mongoose/requestHandlers/query.js
index 0d523c33ae..9364b39b55 100644
--- a/src/mongoose/requestHandlers/query.js
+++ b/src/mongoose/requestHandlers/query.js
@@ -2,15 +2,19 @@ const httpStatus = require('http-status');
 const formatErrorResponse = require('../../responses/formatError');
 
 const query = (req, res) => {
-  const queryOptions = {};
+  const paginateQuery = {
+    limit: req.query.limit,
+    page: req.query.page,
+    options: {},
+  };
 
   if (req.query.depth) {
-    queryOptions.autopopulate = {
+    paginateQuery.options.autopopulate = {
       maxDepth: req.query.depth,
     };
   }
 
-  req.model.paginate(req.model.apiQuery(req.query, req.locale), { options: queryOptions }, (err, result) => {
+  req.model.paginate(req.model.apiQuery(req.query, req.locale), paginateQuery, (err, result) => {
     if (err) {
       return res.status(httpStatus.INTERNAL_SERVER_ERROR).json(formatErrorResponse(err, 'mongoose'));
     }