diff --git a/src/lib/richtextprocessor.ts b/src/lib/richtextprocessor.ts
index d3806778..0aa64ec9 100644
--- a/src/lib/richtextprocessor.ts
+++ b/src/lib/richtextprocessor.ts
@@ -104,7 +104,10 @@ const markdownEntities: {[markdown: string]: MessageEntity['_']} = {
   '_-_': 'messageEntityUnderline'
 };
 
-const passConflictingEntities: Set<MessageEntity['_']> = new Set();
+const passConflictingEntities: Set<MessageEntity['_']> = new Set([
+  'messageEntityEmoji',
+  'messageEntityLinebreak'
+]);
 for(let i in markdownEntities) {
   passConflictingEntities.add(markdownEntities[i]);
 }