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 92f675f62..258354b19 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt
@@ -1000,6 +1000,7 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
             }
             AccountType.MASTODON -> {
                 addMastodonMentions(status.text_unescaped, status.spans, mentions)
+                mentions.remove("${accountUser.screen_name}@${accountUser.key.host}")
             }
             else -> if (status.mentions.isNotNullOrEmpty()) {
                 status.mentions.filterNot {