diff --git a/packages/pl-api/lib/features.ts b/packages/pl-api/lib/features.ts
index a2ce7e7df..2fb4bceaf 100644
--- a/packages/pl-api/lib/features.ts
+++ b/packages/pl-api/lib/features.ts
@@ -1078,7 +1078,7 @@ const getFeatures = (instance: Instance) => {
      * Can set content warnings on statuses.
      * @see POST /api/v1/statuses
      */
-    spoilers: true,
+    spoilers: v.software !== MITRA,
 
     /**
      * @see POST /api/friendica/statuses/:id/dislike
diff --git a/packages/pl-fe/src/features/compose/components/compose-form.tsx b/packages/pl-fe/src/features/compose/components/compose-form.tsx
index 8bc10ec68..668c1108d 100644
--- a/packages/pl-fe/src/features/compose/components/compose-form.tsx
+++ b/packages/pl-fe/src/features/compose/components/compose-form.tsx
@@ -234,13 +234,15 @@ const ComposeForm = <ID extends string>({ id, shouldCondense, autoFocus, clickab
         </HStack>
       )}
 
-      <SpoilerInput
-        composeId={id}
-        onSuggestionsFetchRequested={onSuggestionsFetchRequested}
-        onSuggestionsClearRequested={onSuggestionsClearRequested}
-        onSuggestionSelected={onSpoilerSuggestionSelected}
-        theme={transparent ? 'transparent' : 'normal'}
-      />
+      {features.spoilers && (
+        <SpoilerInput
+          composeId={id}
+          onSuggestionsFetchRequested={onSuggestionsFetchRequested}
+          onSuggestionsClearRequested={onSuggestionsClearRequested}
+          onSuggestionSelected={onSpoilerSuggestionSelected}
+          theme={transparent ? 'transparent' : 'normal'}
+        />
+      )}
 
       <div>
         <Suspense>