diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
index 10b56a5c0..1c7d023f8 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -449,7 +449,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				if(!mentions.contains(m))
 					mentions.add(m);
 			}
-			initialText=TextUtils.join(" ", mentions)+" ";
+			initialText=mentions.isEmpty() ? "" : TextUtils.join(" ", mentions)+" ";
 			if(savedInstanceState==null){
 				mainEditText.setText(initialText);
 				mainEditText.setSelection(mainEditText.length());