diff --git a/src/lib/components/chat/Messages/Markdown/MarkdownInlineTokens/CodespanToken.svelte b/src/lib/components/chat/Messages/Markdown/MarkdownInlineTokens/CodespanToken.svelte
index 48144f9a0d..deb0eee54b 100644
--- a/src/lib/components/chat/Messages/Markdown/MarkdownInlineTokens/CodespanToken.svelte
+++ b/src/lib/components/chat/Messages/Markdown/MarkdownInlineTokens/CodespanToken.svelte
@@ -4,6 +4,8 @@
 
 	import { getContext } from 'svelte';
 
+	import { settings } from '$lib/stores';
+
 	const i18n = getContext('i18n');
 
 	export let token;
@@ -13,7 +15,9 @@
 <!-- svelte-ignore a11y-click-events-have-key-events -->
 <!-- svelte-ignore a11y-no-noninteractive-element-interactions -->
 <code
-	class="codespan cursor-pointer {!done ? 'fade-in-token' : ''}"
+	class="codespan cursor-pointer {!done && ($settings?.chatFadeStreamingText ?? true)
+		? 'fade-in-token'
+		: ''}"
 	on:click={() => {
 		copyToClipboard(unescapeHtml(token.text));
 		toast.success($i18n.t('Copied to clipboard'));
diff --git a/src/lib/components/chat/Messages/Markdown/MarkdownInlineTokens/TextToken.svelte b/src/lib/components/chat/Messages/Markdown/MarkdownInlineTokens/TextToken.svelte
index b057133774..38e5dd144b 100644
--- a/src/lib/components/chat/Messages/Markdown/MarkdownInlineTokens/TextToken.svelte
+++ b/src/lib/components/chat/Messages/Markdown/MarkdownInlineTokens/TextToken.svelte
@@ -1,11 +1,13 @@
 <script lang="ts">
+	import { settings } from '$lib/stores';
+
 	export let token;
 	export let done = true;
 
 	$: raw = token?.raw ?? '';
 </script>
 
-{#if done}
+{#if done || !($settings?.chatFadeStreamingText ?? true)}
 	{raw}
 {:else}
 	{#each raw.split(' ') as text}
diff --git a/src/lib/components/chat/Messages/ResponseMessage.svelte b/src/lib/components/chat/Messages/ResponseMessage.svelte
index 2e9488ae6c..1a9719bf45 100644
--- a/src/lib/components/chat/Messages/ResponseMessage.svelte
+++ b/src/lib/components/chat/Messages/ResponseMessage.svelte
@@ -833,9 +833,7 @@
 									{compactPreview}
 									{editCodeBlock}
 									{topPadding}
-									done={($settings?.chatFadeStreamingText ?? true)
-										? (message?.done ?? false)
-										: true}
+									done={message?.done ?? false}
 									{model}
 									onTaskClick={async (e) => {
 										console.log(e);