diff --git a/app/javascript/mastodon/features/emoji/emoji_html.tsx b/app/javascript/mastodon/features/emoji/emoji_html.tsx
index 08d62b2c37a..5298dcb038c 100644
--- a/app/javascript/mastodon/features/emoji/emoji_html.tsx
+++ b/app/javascript/mastodon/features/emoji/emoji_html.tsx
@@ -32,10 +32,6 @@ export const ModernEmojiHTML = ({
     deep: !shallow,
   });
 
-  if (emojifiedHtml === null) {
-    return null;
-  }
-
   return (
     <Wrapper
       {...props}
diff --git a/app/javascript/mastodon/features/emoji/hooks.ts b/app/javascript/mastodon/features/emoji/hooks.ts
index 0c3f61b8841..8a6880964ac 100644
--- a/app/javascript/mastodon/features/emoji/hooks.ts
+++ b/app/javascript/mastodon/features/emoji/hooks.ts
@@ -26,7 +26,7 @@ export function useEmojify({
   extraEmojis,
   deep = true,
 }: UseEmojifyOptions) {
-  const [emojifiedText, setEmojifiedText] = useState<string | null>(null);
+  const [emojifiedText, setEmojifiedText] = useState(text);
 
   const appState = useEmojiAppState();
   const extra: ExtraCustomEmojiMap = useMemo(() => {
@@ -55,6 +55,7 @@ export function useEmojify({
     },
     [appState, deep, extra],
   );
+
   useLayoutEffect(() => {
     if (isModernEmojiEnabled() && !!text.trim()) {
       const result = emojify(text);