diff --git a/client/web/plugins/com.msgbyte.bbcode/src/tags/MentionTag.tsx b/client/web/plugins/com.msgbyte.bbcode/src/tags/MentionTag.tsx
index 3a373642..5a02a183 100644
--- a/client/web/plugins/com.msgbyte.bbcode/src/tags/MentionTag.tsx
+++ b/client/web/plugins/com.msgbyte.bbcode/src/tags/MentionTag.tsx
@@ -1,3 +1,4 @@
+import { UserName } from '@capital/component';
 import React from 'react';
 import type { TagProps } from '../bbcode/type';
 
@@ -8,7 +9,7 @@ export const MentionTag: React.FC<TagProps> = React.memo((props) => {
 
   return (
     <span className="plugin-bbcode-mention-tag" data-userid={userId}>
-      @{userName}
+      @{userName ?? <UserName userId={userId} />}
     </span>
   );
 });