diff --git a/extensions/mentions/js/src/forum/index.js b/extensions/mentions/js/src/forum/index.js
index 937b6339d..9f127702e 100644
--- a/extensions/mentions/js/src/forum/index.js
+++ b/extensions/mentions/js/src/forum/index.js
@@ -70,3 +70,5 @@ app.initializers.add('flarum-mentions', function() {
   // Remove post mentions when rendering post previews.
   getPlainContent.removeSelectors.push('a.PostMention');
 });
+
+export * from './utils/textFormatter';
diff --git a/extensions/mentions/src/Listener/FormatPostMentions.php b/extensions/mentions/src/Listener/FormatPostMentions.php
index 1e3ac3112..0ef578a32 100755
--- a/extensions/mentions/src/Listener/FormatPostMentions.php
+++ b/extensions/mentions/src/Listener/FormatPostMentions.php
@@ -65,7 +65,7 @@ class FormatPostMentions
 
         $tag->filterChain
             ->prepend([static::class, 'addId'])
-            ->setJS('function(tag) { return System.get("flarum/mentions/utils/textFormatter").filterPostMentions(tag); }');
+            ->setJS('function(tag) { return flarum.extensions["flarum-mentions"].filterPostMentions(tag); }');
 
         $configurator->Preg->match('/\B@(?<username>[a-z0-9_-]+)#(?<id>\d+)/i', $tagName);
     }
diff --git a/extensions/mentions/src/Listener/FormatUserMentions.php b/extensions/mentions/src/Listener/FormatUserMentions.php
index b9bf0e3f7..653054f66 100755
--- a/extensions/mentions/src/Listener/FormatUserMentions.php
+++ b/extensions/mentions/src/Listener/FormatUserMentions.php
@@ -60,7 +60,7 @@ class FormatUserMentions
 
         $tag->template = '<a href="{$PROFILE_URL}{@username}" class="UserMention">@<xsl:value-of select="@displayname"/></a>';
         $tag->filterChain->prepend([static::class, 'addId'])
-            ->setJS('function(tag) { return System.get("flarum/mentions/utils/textFormatter").filterUserMentions(tag); }');
+            ->setJS('function(tag) { return flarum.extensions["flarum-mentions"].filterUserMentions(tag); }');
 
         $configurator->Preg->match('/\B@(?<username>[a-z0-9_-]+)(?!#)/i', $tagName);
     }