diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt
index 29741ad58..dd3750337 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt
@@ -203,21 +203,21 @@ fun ImageVideoPost(postViewModel: NewMediaModel, acc: Account) {
         )
     }
 
-    Row(
-        verticalAlignment = Alignment.CenterVertically,
-        modifier = Modifier.fillMaxWidth()
-    ) {
-        SettingSwitchItem(
-            checked = postViewModel.sensitiveContent,
-            onCheckedChange = { postViewModel.sensitiveContent = it },
-            title = R.string.add_sensitive_content_label,
-            description = R.string.add_sensitive_content_description
-        )
-    }
-
     if (isNIP94Server(postViewModel.selectedServer) ||
         postViewModel.selectedServer == ServersAvailable.NIP95
     ) {
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            SettingSwitchItem(
+                checked = postViewModel.sensitiveContent,
+                onCheckedChange = { postViewModel.sensitiveContent = it },
+                title = R.string.add_sensitive_content_label,
+                description = R.string.add_sensitive_content_description
+            )
+        }
+
         Row(
             verticalAlignment = Alignment.CenterVertically,
             modifier = Modifier
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt
index 0b06b28b6..89bb3d5a5 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt
@@ -988,21 +988,21 @@ fun ImageVideoDescription(
                 )
             }
 
-            Row(
-                verticalAlignment = Alignment.CenterVertically,
-                modifier = Modifier.fillMaxWidth()
-            ) {
-                SettingSwitchItem(
-                    checked = sensitiveContent,
-                    onCheckedChange = { sensitiveContent = it },
-                    title = R.string.add_sensitive_content_label,
-                    description = R.string.add_sensitive_content_description
-                )
-            }
-
             if (isNIP94Server(selectedServer) ||
                 selectedServer == ServersAvailable.NIP95
             ) {
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    modifier = Modifier.fillMaxWidth()
+                ) {
+                    SettingSwitchItem(
+                        checked = sensitiveContent,
+                        onCheckedChange = { sensitiveContent = it },
+                        title = R.string.add_sensitive_content_label,
+                        description = R.string.add_sensitive_content_description
+                    )
+                }
+
                 Row(
                     verticalAlignment = Alignment.CenterVertically,
                     modifier = Modifier