diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/Emoji.java b/TMessagesProj/src/main/java/org/telegram/messenger/Emoji.java
index a4150bd4e..67e6e43c6 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/Emoji.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/Emoji.java
@@ -545,8 +545,8 @@ public class Emoji {
 
     public static CharSequence replaceEmoji(CharSequence cs, Paint.FontMetricsInt fontMetrics, int size, boolean createNew, int[] emojiOnly, boolean allowAnimated, AtomicReference<WeakReference<View>> viewRef) {
         allowAnimated = false;
-        if (NekoConfig.useSystemEmoji.Bool() || cs == null || cs.length() == 0) {
-            return cs;
+        if (NekoConfig.useSystemEmoji.Bool() || cs.length() == 0) {
+            return Spannable.Factory.getInstance().newSpannable(cs.toString());
         }
         Spannable s;
         if (!createNew && cs instanceof Spannable) {