diff --git a/src/Util/Formatting.php b/src/Util/Formatting.php
index 757595acf7..07e27aab23 100644
--- a/src/Util/Formatting.php
+++ b/src/Util/Formatting.php
@@ -450,7 +450,7 @@ abstract class Formatting
         foreach ($points as $position => $mention) {
             $linkText = self::linkifyMentionArray($mention);
 
-            $text = substr_replace($text, $linkText, $position-1, $mention['length']+1);
+            $text = substr_replace($text, $linkText, $position - 1, $mention['length'] + 1);
         }
 
         return [$text, $mentions];
@@ -471,7 +471,7 @@ abstract class Formatting
             }
 
             $output = HTML::html(['span' => ['attrs' => ['class' => 'h-card'],
-                '@' . HTML::html(['a' => ['attrs' => $attrs, $mention['title']]], options: ['indent' => false]),
+                '@' . HTML::html(['a' => ['attrs' => $attrs, $mention['title'] ?? $mention['text']]], options: ['indent' => false]),
             ]], options: ['indent' => false, 'raw' => true]);
 
             Event::handle('EndLinkifyMention', [$mention, &$output]);