diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.js b/client/coral-admin/src/routes/Moderation/components/Comment.js
index 4c08f1559..0856e4657 100644
--- a/client/coral-admin/src/routes/Moderation/components/Comment.js
+++ b/client/coral-admin/src/routes/Moderation/components/Comment.js
@@ -209,7 +209,7 @@ class Comment extends React.Component {
 Comment.propTypes = {
   viewUserDetail: PropTypes.func.isRequired,
   acceptComment: PropTypes.func.isRequired,
-  selectComment: PropTypes.func.isRequired,
+  selectComment: PropTypes.func,
   rejectComment: PropTypes.func.isRequired,
   onClick: PropTypes.func,
   className: PropTypes.string,
diff --git a/client/coral-admin/src/routes/Moderation/components/ModerationQueue.js b/client/coral-admin/src/routes/Moderation/components/ModerationQueue.js
index 3963e9c01..87833151a 100644
--- a/client/coral-admin/src/routes/Moderation/components/ModerationQueue.js
+++ b/client/coral-admin/src/routes/Moderation/components/ModerationQueue.js
@@ -129,7 +129,7 @@ class ModerationQueue extends React.Component {
     }
 
     // Scroll to selected comment.
-    if (prev.selectedCommentId !== this.props.selectedCommentId) {
+    if (prev.selectedCommentId !== this.props.selectedCommentId && this.listRef) {
 
       const view = this.getVisibleComments();
       const index = view.findIndex(({id}) => id === this.props.selectedCommentId);
@@ -298,7 +298,6 @@ class ModerationQueue extends React.Component {
             rejectComment={props.rejectComment}
             currentAsset={props.currentAsset}
             currentUserId={this.props.currentUserId}
-            selectComment={() => this.props.selectCommentId(comment.id)}
           />;
         </div>
       );