diff --git a/src/components/catalog-row/catalog-row.tsx b/src/components/catalog-row/catalog-row.tsx
index f312d14b..493bd1d8 100644
--- a/src/components/catalog-row/catalog-row.tsx
+++ b/src/components/catalog-row/catalog-row.tsx
@@ -188,9 +188,7 @@ const CatalogPost = ({ post }: { post: Comment }) => {
   });
 
   const postContent = (
-    <div className={`${styles.teaser} ${hidden && styles.hidden}`}>
-      {hidden ? <b>({t('hidden')})</b> : <Markdown title={title} content={content} spoiler={spoiler} />}
-    </div>
+    <div className={`${styles.teaser} ${hidden && styles.hidden}`}>{hidden ? <b>({t('hidden')})</b> : <Markdown title={title} content={content} />}</div>
   );
 
   const { imageSize, showOPComment } = useCatalogStyleStore();
diff --git a/src/components/markdown/markdown.tsx b/src/components/markdown/markdown.tsx
index 72b9fdcf..8414b581 100644
--- a/src/components/markdown/markdown.tsx
+++ b/src/components/markdown/markdown.tsx
@@ -124,7 +124,6 @@ const blockquoteToGreentext = () => (tree: any) => {
 
 interface MarkdownProps {
   content: string;
-  spoiler?: boolean;
   title?: string;
 }
 
diff --git a/src/components/post-desktop/post-desktop.tsx b/src/components/post-desktop/post-desktop.tsx
index 56071367..9712b468 100644
--- a/src/components/post-desktop/post-desktop.tsx
+++ b/src/components/post-desktop/post-desktop.tsx
@@ -207,7 +207,7 @@ const PostMedia = ({ post }: PostProps) => {
           </span>
         )}
       </div>
-      {(hasThumbnail || (!hasThumbnail && !showThumbnail)) && (
+      {(hasThumbnail || (!hasThumbnail && !showThumbnail) || spoiler) && (
         <div className={styles.fileThumbnail}>
           <CommentMedia commentMediaInfo={commentMediaInfo} post={post} showThumbnail={showThumbnail} setShowThumbnail={setShowThumbnail} />
         </div>
@@ -217,7 +217,7 @@ const PostMedia = ({ post }: PostProps) => {
 };
 
 const PostMessage = ({ post }: PostProps) => {
-  const { cid, content, deleted, edit, original, parentCid, postCid, reason, removed, spoiler, state, subplebbitAddress } = post || {};
+  const { cid, content, deleted, edit, original, parentCid, postCid, reason, removed, state, subplebbitAddress } = post || {};
   // TODO: commentAuthor is not available outside of editedComment, update when available
   // const banned = !!post?.commentAuthor?.banExpiresAt;
   const { t } = useTranslation();
@@ -252,7 +252,7 @@ const PostMessage = ({ post }: PostProps) => {
         <Tooltip children={<span className={styles.deletedContent}>{t('user_deleted_this_post')}</span>} content={reason && `${t('reason')}: ${reason}`} />
       ) : (
         <>
-          {!showOriginal && <Markdown content={displayContent} spoiler={spoiler} />}
+          {!showOriginal && <Markdown content={displayContent} />}
           {edit && original?.content !== post?.content && (
             <span className={styles.editedInfo}>
               {showOriginal && <Markdown content={original?.content} />}
diff --git a/src/components/post-mobile/post-mobile.tsx b/src/components/post-mobile/post-mobile.tsx
index c7618ac9..4ff75356 100644
--- a/src/components/post-mobile/post-mobile.tsx
+++ b/src/components/post-mobile/post-mobile.tsx
@@ -152,7 +152,7 @@ const ReplyBacklinks = ({ post }: PostProps) => {
 
 const PostMessageMobile = ({ post }: PostProps) => {
   const { t } = useTranslation();
-  const { cid, commentAuthor, content, deleted, edit, original, parentCid, postCid, reason, removed, spoiler, state, subplebbitAddress } = post || {};
+  const { cid, content, deleted, edit, original, parentCid, postCid, reason, removed, state, subplebbitAddress } = post || {};
   // TODO: commentAuthor is not available outside of editedComment, update when available
   // const banned = !!post?.commentAuthor?.banExpiresAt;
   const [showOriginal, setShowOriginal] = useState(false);
@@ -188,7 +188,7 @@ const PostMessageMobile = ({ post }: PostProps) => {
           <Tooltip children={<span className={styles.deletedContent}>{t('user_deleted_this_post')}</span>} content={reason && `${t('reason')}: ${reason}`} />
         ) : (
           <>
-            {!showOriginal && <Markdown content={displayContent} spoiler={spoiler} />}
+            {!showOriginal && <Markdown content={displayContent} />}
             {edit && original?.content !== post?.content && (
               <span className={styles.editedInfo}>
                 {showOriginal && <Markdown content={original?.content} />}