diff --git a/src/elements/content-sidebar/activity-feed/approval-comment-form/ApprovalCommentForm.js b/src/elements/content-sidebar/activity-feed/approval-comment-form/ApprovalCommentForm.js
index 8fa54ffd4a..600f5480b8 100644
--- a/src/elements/content-sidebar/activity-feed/approval-comment-form/ApprovalCommentForm.js
+++ b/src/elements/content-sidebar/activity-feed/approval-comment-form/ApprovalCommentForm.js
@@ -201,7 +201,7 @@ class ApprovalCommentForm extends React.Component<Props, State> {
             approverSelectorContacts,
             className,
             createTask,
-            getMentionWithQuery = noop,
+            getMentionWithQuery,
             intl: { formatMessage },
             isDisabled,
             isOpen,
diff --git a/src/elements/content-sidebar/activity-feed/approval-comment-form/__tests__/ApprovalCommentForm-test.js b/src/elements/content-sidebar/activity-feed/approval-comment-form/__tests__/ApprovalCommentForm-test.js
index 8cf232f609..e6618d9564 100644
--- a/src/elements/content-sidebar/activity-feed/approval-comment-form/__tests__/ApprovalCommentForm-test.js
+++ b/src/elements/content-sidebar/activity-feed/approval-comment-form/__tests__/ApprovalCommentForm-test.js
@@ -395,6 +395,17 @@ describe('elements/content-sidebar/ActivityFeed/approval-comment-form/ApprovalCo
         expect(content).toEqual('');
     });
 
+    test('should not display trigger @mention selector when getMentionQuery prop is empty', () => {
+        const wrapper = render({ getMentionWithQuery: null });
+
+        expect(
+            wrapper
+                .find('DraftJSMentionSelector')
+                .at(0)
+                .prop('onMention'),
+        ).toEqual(null);
+    });
+
     describe('handleApproverSelectorInput()', () => {
         test('should call getApproverWithQuery() when called', () => {
             const value = 'test';