diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/compatibility/AndroidCrashFixer.kt b/app/src/main/java/de/kuschku/quasseldroid/util/compatibility/AndroidCrashFixer.kt
index 93654d0206eb8b148ef50e61368a84734081490f..27ce0abe42e3a55f69db0be6277325210020d8cc 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/compatibility/AndroidCrashFixer.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/compatibility/AndroidCrashFixer.kt
@@ -23,19 +23,14 @@ object AndroidCrashFixer {
   fun removeCrashableCharacters(text: String): String {
     var previousRtlModifier = 0.toChar()
     return text.fold(StringBuilder()) { builder, char ->
-      previousRtlModifier = if (char != '\u200E' && char != '\u200F') {
-        if (!char.isWhitespace()) {
-          if (previousRtlModifier != 0.toChar()) {
-            builder.append(previousRtlModifier)
-          }
-          builder.append(char)
-          0.toChar()
-        } else {
-          builder.append(char)
-          previousRtlModifier
+      if (char != '\u200E' && char != '\u200F') {
+        if (previousRtlModifier != 0.toChar() && !char.isWhitespace()) {
+          builder.append(previousRtlModifier)
+          previousRtlModifier = 0.toChar()
         }
+        builder.append(char)
       } else {
-        char
+        previousRtlModifier = char
       }
       builder
     }.toString()