diff --git a/src/components/views/Board.jsx b/src/components/views/Board.jsx
index dd3e9658..20f84677 100644
--- a/src/components/views/Board.jsx
+++ b/src/components/views/Board.jsx
@@ -521,7 +521,7 @@ const Board = () => {
                   {renderedComments?.map((reply) => {
                     const replyMediaInfo = getCommentMediaInfo(reply);
                     const fallbackImgUrl = "/assets/filedeleted-res.gif";
-                    const parentShortCid = findParentShortCid(reply.parentCid, selectedFeed);
+                    const shortParentCid = findParentShortCid(reply.parentCid, selectedFeed);
                     return (
                       <div key={`rc-${reply.cid}`} className="reply-container">
                         <div key={`sa-${reply.cid}`} className="side-arrows">{'>>'}</div>
@@ -637,7 +637,7 @@ const Board = () => {
                               </Fragment>
                             : <blockquote key={`pm-${reply.cid}`} className="post-message">
                                 <Link to="" key={`r-pm-${reply.cid}`} className="quotelink" onClick={() => {}}>
-                                    {`c/${parentShortCid}`}{<br />}
+                                    {`c/${shortParentCid}`}{<br />}
                                 </Link>
                                 <Post content={reply.content} key={`post-${reply.cid}`} handlequoteclick={handleQuoteClick} comment={reply} />
                               </blockquote>)
diff --git a/src/components/views/Thread.jsx b/src/components/views/Thread.jsx
index 17e2cb78..51bc020c 100644
--- a/src/components/views/Thread.jsx
+++ b/src/components/views/Thread.jsx
@@ -11,6 +11,7 @@ import Post from '../Post';
 import PostLoader from '../PostLoader';
 import ReplyModal from '../ReplyModal';
 import SettingsModal from '../SettingsModal';
+import findParentShortCid from '../../utils/findParentShortCid';
 import getCommentMediaInfo from '../../utils/getCommentMediaInfo';
 import getDate from '../../utils/getDate';
 import handleQuoteClick from '../../utils/handleQuoteClick';
@@ -509,6 +510,7 @@ const Thread = () => {
               renderedComments.map((reply) => {
                   const replyMediaInfo = getCommentMediaInfo(reply);
                   const fallbackImgUrl = "/assets/filedeleted-res.gif";
+                  const shortParentCid = findParentShortCid(reply.parentCid, comment);
                   return (
                     <div key={`pc-${reply.cid}-${Math.random()}`} className="reply-container">
                       <div key={`sa-${reply.cid}`} className="side-arrows">{'>>'}</div>
@@ -611,6 +613,10 @@ const Thread = () => {
                             </div>
                           ) : null}
                         <blockquote key={`pm-${reply.cid}`} className="post-message">
+                          <Link to={() => {}} className="quote-link"
+                            onClick={(event) => handleQuoteClick(reply, event)}>
+                            {`c/${shortParentCid}`}{<br />}
+                          </Link>
                           <Post content={reply.content} comment={reply} handlequoteclick={handleQuoteClick} key={`post-${reply.cid}`} />
                         </blockquote>
                       </div>
diff --git a/src/utils/findParentShortCid.js b/src/utils/findParentShortCid.js
index 3f18b5f3..2cf62b29 100644
--- a/src/utils/findParentShortCid.js
+++ b/src/utils/findParentShortCid.js
@@ -1,5 +1,7 @@
-function findParentShortCid(parentCid, selectedFeed) {
-  for (const thread of selectedFeed) {
+function findParentShortCid(parentCid, input) {
+  const feed = Array.isArray(input) ? input : [input];
+
+  for (const thread of feed) {
     if (thread.cid === parentCid) {
       return thread.shortCid;
     }