diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/RichEditText.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/RichEditText.kt
index 6b859773c1338659b73e62a343bfe092bf48c329..71ee2550a72ddb9b9642e516cdb7d2773c642f32 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/RichEditText.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/RichEditText.kt
@@ -331,7 +331,7 @@ class RichEditText : EditTextSelectionChange {
 
   fun appendText(text: CharSequence?, suffix: String?) {
     val shouldAddSuffix = this.text.isEmpty()
-    if (!this.text.endsWith(" "))
+    if (this.text.isNotEmpty() && !this.text.endsWith(" "))
       this.text.append(" ")
     this.text.append(text)
     if (shouldAddSuffix)