diff --git a/src/lib/components/chat/Messages/Markdown/MarkdownInlineTokens/MentionToken.svelte b/src/lib/components/chat/Messages/Markdown/MarkdownInlineTokens/MentionToken.svelte
index c23307e515..5c40849df6 100644
--- a/src/lib/components/chat/Messages/Markdown/MarkdownInlineTokens/MentionToken.svelte
+++ b/src/lib/components/chat/Messages/Markdown/MarkdownInlineTokens/MentionToken.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
-	import Tooltip from '$lib/components/common/Tooltip.svelte';
 	import type { Token } from 'marked';
+	import Tooltip from '$lib/components/common/Tooltip.svelte';
 
 	export let token: Token;
 </script>
 
 <Tooltip as="span" className="mention" content={token.id} placement="top">
-	{token.triggerChar}{token.label}
+	{token?.triggerChar ?? '@'}{token?.label ?? token?.id}
 </Tooltip>