diff --git a/libs/model/src/aggregates/thread/GetActiveThreads.query.ts b/libs/model/src/aggregates/thread/GetActiveThreads.query.ts
index b470ad42328..4be8795e7ad 100644
--- a/libs/model/src/aggregates/thread/GetActiveThreads.query.ts
+++ b/libs/model/src/aggregates/thread/GetActiveThreads.query.ts
@@ -144,6 +144,7 @@ ${
         Select tempC.* FROM "Comments" tempC
         JOIN T tempTT ON tempTT.id = tempC.thread_id
         WHERE deleted_at IS NULL
+          AND tempC.marked_as_spam_at IS NULL
         ORDER BY created_at DESC
         LIMIT :withXRecentComments
       ) COM
diff --git a/libs/model/src/utils/getBaseActivityFeed.ts b/libs/model/src/utils/getBaseActivityFeed.ts
index a59ac73d887..27d98a61918 100644
--- a/libs/model/src/utils/getBaseActivityFeed.ts
+++ b/libs/model/src/utils/getBaseActivityFeed.ts
@@ -76,6 +76,7 @@ const baseActivityQuery = `
           WHERE
             C.thread_id = T.id
             AND C.deleted_at IS NULL
+            AND C.marked_as_spam_at IS NULL
         ) C WHERE C.rn <= :comment_limit), '[]') as comments
   FROM
     gated_output T
@@ -104,6 +105,11 @@ WITH output_with_topics AS (
     JOIN "Communities" C ON C.id = T.community_id 
   WHERE
     T.id IN (:threadIds)
+    AND T.deleted_at IS NULL
+    AND T.archived_at IS NULL
+    AND T.marked_as_spam_at IS NULL
+    AND C.active IS TRUE
+    AND C.tier != ${CommunityTierMap.SpamCommunity}
     ${community_id ? 'AND T.community_id = :community_id' : ''}
     ${search ? 'AND T.title ILIKE :search' : ''}
 ),
diff --git a/packages/commonwealth/client/scripts/views/pages/discussions/ThreadCard/ThreadCard.tsx b/packages/commonwealth/client/scripts/views/pages/discussions/ThreadCard/ThreadCard.tsx
index 7b9ce98cf9a..b5e6af3068b 100644
--- a/packages/commonwealth/client/scripts/views/pages/discussions/ThreadCard/ThreadCard.tsx
+++ b/packages/commonwealth/client/scripts/views/pages/discussions/ThreadCard/ThreadCard.tsx
@@ -397,7 +397,10 @@ export const ThreadCard = ({
       thread?.recentComments?.length > 0 ? (
         <div className={clsx('RecentComments', { hideReactionButton })}>
           {[...(thread?.recentComments || [])]
-            ?.filter((recentComment) => !recentComment.deleted)
+            ?.filter(
+              (recentComment) =>
+                !recentComment.deleted && !recentComment.markedAsSpamAt,
+            )
             ?.slice?.(0, maxRecentCommentsToDisplay)
             ?.sort((a, b) => b.createdAt.unix() - a.createdAt.unix())
             ?.map((recentComment) => (