diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java b/TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java
index dbafd39b0e..7cb9c1d6d1 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java
@@ -4267,7 +4267,9 @@ public void sendMessage(SendMessageParams sendMessageParams) {
                 entities = pair.getSecond();
 
                 newMsg.message = pair.getFirst();
-                newMsg.entities = pair.getSecond();
+                if (entities != null && !entities.isEmpty()) {
+                    newMsg.entities = entities;
+                }
             }
 
             if (stars > 0) {