diff --git a/src/lib/components/chat/Messages/Markdown/MarkdownInlineTokens.svelte b/src/lib/components/chat/Messages/Markdown/MarkdownInlineTokens.svelte
index a5e97ed9e8..3657233733 100644
--- a/src/lib/components/chat/Messages/Markdown/MarkdownInlineTokens.svelte
+++ b/src/lib/components/chat/Messages/Markdown/MarkdownInlineTokens.svelte
@@ -75,12 +75,11 @@
 			`<sup class="footnote-ref footnote-ref-text">${token.escapedText}</sup>`
 		) || ''}
 	{:else if token.type === 'citation'}
-		<SourceToken {id} {token} {sourceIds} onClick={onSourceClick} />
-		<!-- {#if token.ids && token.ids.length > 0}
-			{#each token.ids as sourceId}
-				<Source id={sourceId - 1} title={sourceIds[sourceId - 1]} onClick={onSourceClick} />
-			{/each}
-		{/if} -->
+		{#if (sourceIds ?? []).length > 0}
+			<SourceToken {id} {token} {sourceIds} onClick={onSourceClick} />
+		{:else}
+			<TextToken {token} {done} />
+		{/if}
 	{:else if token.type === 'text'}
 		<TextToken {token} {done} />
 	{/if}
diff --git a/src/lib/components/chat/Messages/Markdown/SourceToken.svelte b/src/lib/components/chat/Messages/Markdown/SourceToken.svelte
index bd02408e36..7e35060dcb 100644
--- a/src/lib/components/chat/Messages/Markdown/SourceToken.svelte
+++ b/src/lib/components/chat/Messages/Markdown/SourceToken.svelte
@@ -39,37 +39,43 @@
 	};
 </script>
 
-{#if (token?.ids ?? []).length == 1}
-	<Source id={token.ids[0] - 1} title={sourceIds[token.ids[0] - 1]} {onClick} />
-{:else}
-	<LinkPreview.Root openDelay={0} bind:open={openPreview}>
-		<LinkPreview.Trigger>
-			<button
-				class="text-[10px] w-fit translate-y-[2px] px-2 py-0.5 dark:bg-white/5 dark:text-white/80 dark:hover:text-white bg-gray-50 text-black/80 hover:text-black transition rounded-xl"
-				on:click={() => {
-					openPreview = !openPreview;
-				}}
+{sourceIds}
+
+{#if sourceIds}
+	{#if (token?.ids ?? []).length == 1}
+		<Source id={token.ids[0] - 1} title={sourceIds[token.ids[0] - 1]} {onClick} />
+	{:else}
+		<LinkPreview.Root openDelay={0} bind:open={openPreview}>
+			<LinkPreview.Trigger>
+				<button
+					class="text-[10px] w-fit translate-y-[2px] px-2 py-0.5 dark:bg-white/5 dark:text-white/80 dark:hover:text-white bg-gray-50 text-black/80 hover:text-black transition rounded-xl"
+					on:click={() => {
+						openPreview = !openPreview;
+					}}
+				>
+					<span class="line-clamp-1">
+						{getDisplayTitle(formattedTitle(decodeString(sourceIds[token.ids[0] - 1])))}
+						<span class="dark:text-white/50 text-black/50">+{(token?.ids ?? []).length - 1}</span>
+					</span>
+				</button>
+			</LinkPreview.Trigger>
+			<LinkPreview.Content
+				class="z-[999]"
+				align="start"
+				strategy="fixed"
+				sideOffset={6}
+				el={containerElement}
 			>
-				<span class="line-clamp-1">
-					{getDisplayTitle(formattedTitle(decodeString(sourceIds[token.ids[0] - 1])))}
-					<span class="dark:text-white/50 text-black/50">+{(token?.ids ?? []).length - 1}</span>
-				</span>
-			</button>
-		</LinkPreview.Trigger>
-		<LinkPreview.Content
-			class="z-[999]"
-			align="start"
-			strategy="fixed"
-			sideOffset={6}
-			el={containerElement}
-		>
-			<div class="bg-gray-50 dark:bg-gray-850 rounded-xl p-1 cursor-pointer">
-				{#each token.ids as sourceId}
-					<div class="">
-						<Source id={sourceId - 1} title={sourceIds[sourceId - 1]} {onClick} />
-					</div>
-				{/each}
-			</div>
-		</LinkPreview.Content>
-	</LinkPreview.Root>
+				<div class="bg-gray-50 dark:bg-gray-850 rounded-xl p-1 cursor-pointer">
+					{#each token.ids as sourceId}
+						<div class="">
+							<Source id={sourceId - 1} title={sourceIds[sourceId - 1]} {onClick} />
+						</div>
+					{/each}
+				</div>
+			</LinkPreview.Content>
+		</LinkPreview.Root>
+	{/if}
+{:else}
+	<span>{token.raw}</span>
 {/if}