diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt
index 56e2881a7..4cc0267ec 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt
@@ -1035,6 +1035,8 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
             editText.setSelection(selectionStart, selectionEnd)
         }
         statusVisibility = intent.getStringExtra(EXTRA_VISIBILITY) ?: status.extras?.visibility
+        possiblySensitive = intent.getBooleanExtra(EXTRA_IS_POSSIBLY_SENSITIVE,
+                details.type == AccountType.MASTODON && status.is_possibly_sensitive)
         accountsAdapter.selectedAccountKeys = arrayOf(status.account_key)
         showReplyLabelAndHint(status)
         return true
@@ -1299,7 +1301,6 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
         if (menuBar == null) return
         val menu = menuBar.menu
         val hasMedia = this.hasMedia
-        menu.setItemAvailability(R.id.toggle_sensitive, hasMedia)
         menu.setItemAvailability(R.id.edit_summary, hasEditSummary)
         menu.setItemAvailability(R.id.schedule, extraFeaturesService.isSupported(
                 ExtraFeaturesService.FEATURE_SCHEDULE_STATUS))
@@ -1307,7 +1308,7 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
                 ExtraFeaturesService.FEATURE_SHARE_GIF))
 
         menu.setGroupAvailability(MENU_GROUP_IMAGE_EXTENSION, hasMedia)
-        menu.setItemChecked(R.id.toggle_sensitive, hasMedia && possiblySensitive)
+        menu.setItemChecked(R.id.toggle_sensitive, possiblySensitive)
 
         val attachLocation = kPreferences[attachLocationKey]
         val attachPreciseLocation = kPreferences[attachPreciseLocationKey]