diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index 02efab8015..8e9d9da101 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -334,6 +334,6 @@ class Formatter
   end
 
   def mention_html(account)
-    "<span class=\"h-card\"><a href=\"#{encode(ActivityPub::TagManager.instance.url_for(account))}\" class=\"u-url mention\">@<span>#{encode(account.username)}</span></a></span>"
+    "<span class=\"h-card\"><a href=\"#{encode(ActivityPub::TagManager.instance.url_for(account))}\" class=\"u-url mention\">@<span>#{format_display_name(account, custom_emojify: true)}</span></a></span>"
   end
 end