diff --git a/src/components/status.jsx b/src/components/status.jsx
index 8030fb28..9e0f2dfb 100644
--- a/src/components/status.jsx
+++ b/src/components/status.jsx
@@ -102,6 +102,7 @@ function Status({
   onMediaClick,
   quoted,
   onStatusLinkClick = () => {},
+  enableCommentHint,
 }) {
   if (skeleton) {
     return (
@@ -293,6 +294,7 @@ function Status({
           size={size}
           contentTextWeight={contentTextWeight}
           readOnly={readOnly}
+          enableCommentHint
         />
       </div>
     );
@@ -994,17 +996,30 @@ function Status({
       (!!inReplyToId && inReplyToAccountId === status.account?.id) ||
       !!snapStates.statusThreadNumber[sKey]
     );
-  }, [inReplyToId, inReplyToAccountId, status.account?.id, snapStates.statusThreadNumber[sKey]]);
+  }, [
+    inReplyToId,
+    inReplyToAccountId,
+    status.account?.id,
+    snapStates.statusThreadNumber[sKey],
+  ]);
 
   const showCommentHint = useMemo(() => {
     return (
+      enableCommentHint &&
       !isThread &&
       !withinContext &&
       !inReplyToId &&
       visibility === 'public' &&
       repliesCount > 0
     );
-  }, [isThread, withinContext, inReplyToId, repliesCount, visibility]);
+  }, [
+    enableCommentHint,
+    isThread,
+    withinContext,
+    inReplyToId,
+    repliesCount,
+    visibility,
+  ]);
 
   return (
     <article
@@ -2463,6 +2478,7 @@ const QuoteStatuses = memo(({ id, instance, level = 0 }) => {
           instance={q.instance}
           size="s"
           quoted={level + 1}
+          enableCommentHint
         />
       </Link>
     );
diff --git a/src/components/timeline.jsx b/src/components/timeline.jsx
index f5968a6b..9b8e7e10 100644
--- a/src/components/timeline.jsx
+++ b/src/components/timeline.jsx
@@ -531,6 +531,7 @@ function TimelineItem({
                         instance={instance}
                         size="s"
                         contentTextWeight
+                        enableCommentHint
                         // allowFilters={allowFilters}
                       />
                     ) : (
@@ -539,6 +540,7 @@ function TimelineItem({
                         instance={instance}
                         size="s"
                         contentTextWeight
+                        enableCommentHint
                         // allowFilters={allowFilters}
                       />
                     )}
@@ -625,12 +627,14 @@ function TimelineItem({
           <Status
             statusID={statusID}
             instance={instance}
+            enableCommentHint
             // allowFilters={allowFilters}
           />
         ) : (
           <Status
             status={status}
             instance={instance}
+            enableCommentHint
             // allowFilters={allowFilters}
           />
         )}