diff --git a/client/coral-admin/src/routes/Moderation/graphql.js b/client/coral-admin/src/routes/Moderation/graphql.js
index 5758315eb2..86bc524b87 100644
--- a/client/coral-admin/src/routes/Moderation/graphql.js
+++ b/client/coral-admin/src/routes/Moderation/graphql.js
@@ -152,6 +152,10 @@ export function cleanUpQueue(root, queue, sortOrder, queueConfig) {
   let nodes = root[queue].nodes;
   let hasNextPage = root[queue].hasNextPage;
 
+  if (!nodes.length) {
+    return root;
+  }
+
   if (queueConfig) {
     nodes = root[queue].nodes.filter((comment) => commentBelongToQueue(queue, comment, queueConfig));
   }
@@ -161,8 +165,8 @@ export function cleanUpQueue(root, queue, sortOrder, queueConfig) {
     sortOrder,
   );
 
-  if (nodes.length > 2) {
-    nodes = nodes.slice(0, 2);
+  if (nodes.length > 100) {
+    nodes = nodes.slice(0, 100);
     hasNextPage = true;
   }
 
diff --git a/test/e2e/specs/04_userStatus.js b/test/e2e/specs/04_userStatus.js
index f4a4455f03..011f59056d 100644
--- a/test/e2e/specs/04_userStatus.js
+++ b/test/e2e/specs/04_userStatus.js
@@ -73,7 +73,7 @@ module.exports = {
       .waitForElementVisible('@usernameDialogSuspend')
       .click('@usernameDialogSuspend')
       .waitForElementVisible('@usernameDialogSuspensionMessage')
-      .click('@usernameDialogSuspend'),
+      .click('@usernameDialogSuspend');
 
     community
       .waitForElementNotPresent('@flaggedUser');