diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
index 2073541a6..b482d50b5 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
@@ -13679,8 +13679,9 @@ public void showFieldPanel(boolean show, MessageObject messageObjectToReply, Mes
                     }
                     nameText = AndroidUtilities.replaceCharSequence("%s", LocaleController.getString(R.string.ReplyTo), name == null ? "" : name);
                 }
+                nameText = StringUtils.zalgoFilter(nameText);
                 nameText = Emoji.replaceEmoji(nameText, replyNameTextView.getPaint().getFontMetricsInt(), false);
-                replyNameTextView.setText(StringUtils.zalgoFilter(name));
+                replyNameTextView.setText(nameText);
                 replyIconImageView.setContentDescription(LocaleController.getString("AccDescrReplying", R.string.AccDescrReplying));
                 replyCloseImageView.setContentDescription(LocaleController.getString("AccDescrCancelReply", R.string.AccDescrCancelReply));
 
diff --git a/TMessagesProj/src/main/java/xyz/nextalone/nnngram/utils/StringUtils.kt b/TMessagesProj/src/main/java/xyz/nextalone/nnngram/utils/StringUtils.kt
index db7c25d6a..9758b2825 100644
--- a/TMessagesProj/src/main/java/xyz/nextalone/nnngram/utils/StringUtils.kt
+++ b/TMessagesProj/src/main/java/xyz/nextalone/nnngram/utils/StringUtils.kt
@@ -145,7 +145,7 @@ object StringUtils {
     }
 
     @JvmStatic
-    fun zalgoFilter(text: String?): String {
+    fun zalgoFilter(text: CharSequence?): CharSequence {
         return if (text == null) {
             ""
         } else if (Config.filterZalgo && text.matches(".*\\p{Mn}{4}.*".toRegex())) {
@@ -156,7 +156,7 @@ object StringUtils {
     }
 
     @JvmStatic
-    fun zalgoFilter(text: CharSequence?): String {
-        return zalgoFilter(text.toString())
+    fun zalgoFilter(text: String): String {
+        return zalgoFilter(text as CharSequence).toString()
     }
 }