diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js
index 12412b244..da0745acc 100644
--- a/client/coral-admin/src/routes/Moderation/components/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js
@@ -156,6 +156,7 @@ class Moderation extends Component {
             root={this.props.root}
             currentAsset={asset}
             comments={comments.nodes}
+            hasNextPage={comments.hasNextPage}
             activeTab={activeTab}
             singleView={moderation.singleView}
             selectedCommentId={moderation.selectedCommentId}
diff --git a/client/coral-admin/src/routes/Moderation/components/ModerationQueue.js b/client/coral-admin/src/routes/Moderation/components/ModerationQueue.js
index 6abe37d25..fbb116cd7 100644
--- a/client/coral-admin/src/routes/Moderation/components/ModerationQueue.js
+++ b/client/coral-admin/src/routes/Moderation/components/ModerationQueue.js
@@ -274,14 +274,13 @@ class ModerationQueue extends React.Component {
     // Last element of list is our AutoLoadMore component and contains an
     // id indicating that this is the last element in list.
     if (index === rowCount - 1) {
-      const hasMore = this.getCommentCountWithoutDagling() < this.props.commentCount;
       key = 'end-of-comment-list';
       child = (
         <div
           style={style}
           id={'end-of-comment-list'}
         >
-          {hasMore && <AutoLoadMore
+          {this.props.hasNextPage && <AutoLoadMore
             loadMore={this.props.loadMore}
             loading={this.props.isLoadingMore}
           />}
@@ -427,6 +426,8 @@ ModerationQueue.propTypes = {
   selectedCommentId: PropTypes.string,
   singleView: PropTypes.bool,
   isLoadingMore: PropTypes.bool,
+  hasNextPage: PropTypes.bool,
+  comments: PropTypes.array,
   activeTab: PropTypes.string.isRequired,
   data: PropTypes.object.isRequired,
   root: PropTypes.object.isRequired,
diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index 38b5b67d9..9ea3baf00 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -207,7 +207,6 @@ class ModerationContainer extends Component {
           [tab]: {
             nodes: {$push: comments.nodes},
             hasNextPage: {$set: comments.hasNextPage},
-            startCursor: {$set: comments.startCursor},
             endCursor: {$set: comments.endCursor},
           },
         });
diff --git a/client/coral-admin/src/routes/Moderation/graphql.js b/client/coral-admin/src/routes/Moderation/graphql.js
index 13ff2ed5a..5758315eb 100644
--- a/client/coral-admin/src/routes/Moderation/graphql.js
+++ b/client/coral-admin/src/routes/Moderation/graphql.js
@@ -45,7 +45,7 @@ function shouldCommentBeAdded(root, queue, comment, sortOrder) {
     : new Date(comment.created_at) >= cursor;
 }
 
-function addCommentToQueue(root, queue, comment, sortOrder) {
+function addCommentToQueue(root, queue, comment, sortOrder, cleanup) {
   if (queueHasComment(root, queue, comment.id)) {
     return root;
   }
@@ -54,24 +54,32 @@ function addCommentToQueue(root, queue, comment, sortOrder) {
     [`${queue}Count`]: {$set: root[`${queue}Count`] + 1},
   };
 
-  if (shouldCommentBeAdded(root, queue, comment, sortOrder)) {
-    const cursor = new Date(root[queue].startCursor);
-    const date = new Date(comment.created_at);
-
-    let append = sortOrder === 'ASC'
-      ? date >= cursor
-      : date <= cursor;
-
-    const nodes = append
-      ? root[queue].nodes.concat(comment)
-      : [comment].concat(...root[queue].nodes);
-
-    changes[queue] = {
-      nodes: {$set: nodes},
-    };
+  if (!shouldCommentBeAdded(root, queue, comment, sortOrder)) {
+    return update(root, changes);
   }
 
-  return update(root, changes);
+  const cursor = new Date(root[queue].startCursor);
+  const date = new Date(comment.created_at);
+
+  let append = sortOrder === 'ASC'
+    ? date >= cursor
+    : date <= cursor;
+
+  const nodes = append
+    ? root[queue].nodes.concat(comment)
+    : [comment].concat(...root[queue].nodes);
+
+  changes[queue] = {
+    nodes: {$set: nodes},
+  };
+
+  const next = update(root, changes);
+
+  if (!cleanup) {
+    return next;
+  }
+
+  return cleanUpQueue(next, queue, sortOrder);
 }
 
 function sortComments(nodes, sortOrder) {
@@ -138,17 +146,31 @@ function applyCommentChanges(root, comment, queueConfig) {
 
 /**
  * Remove dangling comments, sort and resize queues.
+ * If queueConfig is omitted, dangling comments are not removed.
  */
 export function cleanUpQueue(root, queue, sortOrder, queueConfig) {
+  let nodes = root[queue].nodes;
+  let hasNextPage = root[queue].hasNextPage;
+
+  if (queueConfig) {
+    nodes = root[queue].nodes.filter((comment) => commentBelongToQueue(queue, comment, queueConfig));
+  }
+
+  nodes = sortComments(
+    nodes,
+    sortOrder,
+  );
+
+  if (nodes.length > 2) {
+    nodes = nodes.slice(0, 2);
+    hasNextPage = true;
+  }
+
   return update(root, {
     [queue]: {
-      nodes: {
-        $apply: (nodes) =>
-          sortComments(
-            nodes.filter((comment) => commentBelongToQueue(queue, comment, queueConfig)),
-            sortOrder,
-          ).slice(0, 100),
-      },
+      nodes: {$set: nodes},
+      endCursor: {$set: nodes[nodes.length - 1].created_at},
+      hasNextPage: {$set: hasNextPage},
     },
   });
 }
@@ -180,7 +202,7 @@ export function handleCommentChange(root, comment, sortOrder, notify, queueConfi
   Object.keys(queueConfig).forEach((queue) => {
     if (nextQueues.indexOf(queue) >= 0) {
       if (!queueHasComment(next, queue, comment.id)) {
-        next = addCommentToQueue(next, queue, comment, sortOrder);
+        next = addCommentToQueue(next, queue, comment, sortOrder, activeQueue !== queue);
         if (notify && activeQueue === queue && isEndOfListVisible(root, queue)) {
           showNotificationOnce();
         }