diff --git a/src/session/content/room_history/message_row/text.rs b/src/session/content/room_history/message_row/text.rs
index 3477a1bb..26281aa3 100644
--- a/src/session/content/room_history/message_row/text.rs
+++ b/src/session/content/room_history/message_row/text.rs
@@ -218,6 +218,8 @@ impl MessageText {
 
         if EMOJI_REGEX.is_match(text) {
             child.add_css_class("emoji");
+        } else {
+            child.remove_css_class("emoji");
         }
 
         if use_markup {