diff --git a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/activity/ComposeActivityTest.kt b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/activity/ComposeActivityTest.kt
index 2bf8c41a5..b7bd9287b 100644
--- a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/activity/ComposeActivityTest.kt
+++ b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/activity/ComposeActivityTest.kt
@@ -61,6 +61,7 @@ class ComposeActivityTest {
         val statusUpdate = activity.getStatusUpdateTest(false)
         Assert.assertEquals("Test Reply", statusUpdate.text)
         assertExcludedMatches(emptyArray(), statusUpdate)
+        activity.requestSkipDraft()
         activity.finish()
     }
 
@@ -80,6 +81,7 @@ class ComposeActivityTest {
         val statusUpdate = activity.getStatusUpdateTest(false)
         Assert.assertEquals("Test Reply", statusUpdate.text)
         assertExcludedMatches(arrayOf("17484680", "57610574"), statusUpdate)
+        activity.requestSkipDraft()
         activity.finish()
     }
 
@@ -101,6 +103,7 @@ class ComposeActivityTest {
         Assert.assertEquals("https://twitter.com/t_deyarmin/status/847950697987493888",
                 statusUpdate.attachment_url)
         assertExcludedMatches(emptyArray(), statusUpdate)
+        activity.requestSkipDraft()
         activity.finish()
     }
 
@@ -120,6 +123,7 @@ class ComposeActivityTest {
         val statusUpdate = activity.getStatusUpdateTest(false)
         Assert.assertEquals("Test Reply", statusUpdate.text)
         assertExcludedMatches(emptyArray(), statusUpdate)
+        activity.requestSkipDraft()
         activity.finish()
     }
 
@@ -139,6 +143,7 @@ class ComposeActivityTest {
         val statusUpdate = activity.getStatusUpdateTest(false)
         Assert.assertEquals("Test Reply", statusUpdate.text)
         assertExcludedMatches(arrayOf("57610574"), statusUpdate)
+        activity.requestSkipDraft()
         activity.finish()
     }
 
@@ -158,6 +163,7 @@ class ComposeActivityTest {
         val statusUpdate = activity.getStatusUpdateTest(false)
         Assert.assertEquals("Test Reply", statusUpdate.text)
         assertExcludedMatches(arrayOf("583328497", "57610574"), statusUpdate)
+        activity.requestSkipDraft()
         activity.finish()
     }
 
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 239374610..f35aaf7b7 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt
@@ -756,6 +756,10 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
         mediaPreviewAdapter.setAltText(position, altText)
     }
 
+    internal fun requestSkipDraft() {
+        shouldSkipDraft = true
+    }
+
     private fun locationMenuItemSelected(item: MenuItem) {
         item.isChecked = true
         var attachLocationChecked = false