diff --git a/extensions/mentions/src/PostMentionsFormatter.php b/extensions/mentions/src/PostMentionsFormatter.php
index 7d9c1ea30..4e91013ef 100644
--- a/extensions/mentions/src/PostMentionsFormatter.php
+++ b/extensions/mentions/src/PostMentionsFormatter.php
@@ -17,7 +17,8 @@ class PostMentionsFormatter extends FormatterAbstract
         if ($post) {
             $text = $this->ignoreTags($text, ['a', 'code', 'pre'], function ($text) use ($post) {
                 return $this->parser->replace($text, function ($match) use ($post) {
-                    return '<a href="#/d/'.$post->discussion_id.'/-/'.$match['number'].'" class="mention-post" data-number="'.$match['number'].'">'.$match['username'].'</a>';
+                    // TODO: use URL generator
+                    return '<a href="/d/'.$post->discussion_id.'/-/'.$match['number'].'" class="mention-post" data-number="'.$match['number'].'">'.$match['username'].'</a>';
                 }, $text);
             });
         }
diff --git a/extensions/mentions/src/UserMentionsFormatter.php b/extensions/mentions/src/UserMentionsFormatter.php
index 9a9c6d275..0a8a3ea0c 100644
--- a/extensions/mentions/src/UserMentionsFormatter.php
+++ b/extensions/mentions/src/UserMentionsFormatter.php
@@ -16,7 +16,8 @@ class UserMentionsFormatter extends FormatterAbstract
     {
         $text = $this->ignoreTags($text, ['a', 'code', 'pre'], function ($text) {
             return $this->parser->replace($text, function ($match) {
-                return '<a href="#/u/'.$match['username'].'" class="mention-user" data-user="'.$match['username'].'">'.$match['username'].'</a>';
+                // TODO: use URL generator
+                return '<a href="/u/'.$match['username'].'" class="mention-user" data-user="'.$match['username'].'">'.$match['username'].'</a>';
             }, $text);
         });