diff --git a/components/status/StatusContent.vue b/components/status/StatusContent.vue
index 2006fab7..cb3659a6 100644
--- a/components/status/StatusContent.vue
+++ b/components/status/StatusContent.vue
@@ -27,11 +27,15 @@ const isFiltered = $computed(() => filterPhrase && (context && context !== 'deta
       'bg-fade border-primary-light': isDM,
     }"
   >
+    <StatusBody v-if="!isFiltered && status.sensitive && !status.spoilerText" :status="status" :with-action="!isDetails" :class="isDetails ? 'text-xl' : ''" />
     <StatusSpoiler :enabled="status.sensitive || isFiltered" :filter="isFiltered">
-      <template v-if="status.spoilerText || filterPhrase" #spoiler>
-        <p>{{ status.spoilerText || `${$t('status.filter_hidden_phrase')}: ${filterPhrase}` }}</p>
+      <template v-if="filterPhrase" #spoiler>
+        <p>{{ `${$t('status.filter_hidden_phrase')}: ${filterPhrase}` }}</p>
       </template>
-      <StatusBody :status="status" :with-action="!isDetails" :class="isDetails ? 'text-xl' : ''" />
+      <template v-else-if="status.spoilerText" #spoiler>
+        <p>{{ status.spoilerText }}</p>
+      </template>
+      <StatusBody v-if="!status.sensitive || status.spoilerText" :status="status" :with-action="!isDetails" :class="isDetails ? 'text-xl' : ''" />
       <StatusPoll v-if="status.poll" :status="status" />
       <StatusMedia
         v-if="status.mediaAttachments?.length"