diff --git a/src/features/compose/editor/nodes/mention-node.tsx b/src/features/compose/editor/nodes/mention-node.tsx
index 5e86bee015..cb8cbe538a 100644
--- a/src/features/compose/editor/nodes/mention-node.tsx
+++ b/src/features/compose/editor/nodes/mention-node.tsx
@@ -76,6 +76,7 @@ class MentionNode extends DecoratorNode<JSX.Element> {
 
   decorate(): JSX.Element {
     const acct = this.__acct;
+    const username = acct.split('@')[0];
 
     return (
       <button
@@ -84,7 +85,7 @@ class MentionNode extends DecoratorNode<JSX.Element> {
         title={`@${acct}`}
         dir='ltr'
       >
-        @{acct}
+        @{username}
       </button>
     );
   }