diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt
index b8ade248a..fa6647984 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt
@@ -249,7 +249,7 @@ class ComposeViewModel
                             content,
                             spoilerText,
                             statusVisibility.value!!.serverString(),
-                            mediaUris.isNotEmpty() && markMediaAsSensitive.value!!,
+                            mediaUris.isNotEmpty() && (markMediaAsSensitive.value!! || showContentWarning.value!!),
                             mediaIds,
                             mediaUris.map { it.toString() },
                             mediaDescriptions,