diff --git a/extensions/emoji/js/forum/src/main.js b/extensions/emoji/js/forum/src/main.js
index 0b73b931c..af43e47af 100644
--- a/extensions/emoji/js/forum/src/main.js
+++ b/extensions/emoji/js/forum/src/main.js
@@ -3,14 +3,15 @@
 import { override } from 'flarum/extend';
 import app from 'flarum/app';
 import Post from 'flarum/models/Post';
-import Formatter from 'flarum/utils/Formatter';
 
 app.initializers.add('emoji', () => {
   override(Post.prototype, 'contentHtml', original => {
     return twemoji.parse(original());
   });
 
-  override(Formatter, 'format', (original, text) => {
-    return twemoji.parse(original(text));
+  override(s9e.TextFormatter, 'preview', (original, text, element) => {
+    original(text, element);
+
+    twemoji.parse(element);
   });
 });