diff --git a/src/shared/components/comment/comment-node.tsx b/src/shared/components/comment/comment-node.tsx
index 6a0e29ab..895f9b47 100644
--- a/src/shared/components/comment/comment-node.tsx
+++ b/src/shared/components/comment/comment-node.tsx
@@ -501,14 +501,14 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> {
       ? I18NextService.i18n.t("show_context")
       : I18NextService.i18n.t("link");
 
-    // The context button should show the parent comment by default
-    const parentCommentId = getCommentParentId(cv.comment) ?? cv.comment.id;
-
     return (
       <>
         <Link
           className={classnames}
-          to={`/comment/${parentCommentId}`}
+          to={`/comment/${
+            (this.props.showContext && getCommentParentId(cv.comment)) ||
+            cv.comment.id
+          }`}
           title={title}
         >
           <Icon icon="link" classes="icon-inline" />