diff --git a/src/lib/components/chat/Artifacts.svelte b/src/lib/components/chat/Artifacts.svelte
index fbfb1e50b..84906ced9 100644
--- a/src/lib/components/chat/Artifacts.svelte
+++ b/src/lib/components/chat/Artifacts.svelte
@@ -6,16 +6,19 @@
 
 	import { showArtifacts, showControls } from '$lib/stores';
 	import XMark from '../icons/XMark.svelte';
+	import { createMessagesList } from '$lib/utils';
 
-	export let messages;
 	export let overlay = false;
+	export let history;
+	let messages = [];
 
 	let contents: Array<{ content: string }> = [];
 	let selectedContentIdx = 0;
 
 	let iframeElement: HTMLIFrameElement;
 
-	$: if (messages) {
+	$: if (history.currentId) {
+		messages = createMessagesList(history, history.currentId);
 		getContents();
 	}
 
diff --git a/src/lib/components/chat/Chat.svelte b/src/lib/components/chat/Chat.svelte
index ba855dec8..10193a063 100644
--- a/src/lib/components/chat/Chat.svelte
+++ b/src/lib/components/chat/Chat.svelte
@@ -2088,7 +2088,6 @@
 				bind:files
 				bind:pane={controlPane}
 				chatId={$chatId}
-				messages={createMessagesList(history.currentId)}
 				modelId={selectedModelIds?.at(0) ?? null}
 				models={selectedModelIds.reduce((a, e, i, arr) => {
 					const model = $models.find((m) => m.id === e);
diff --git a/src/lib/components/chat/ChatControls.svelte b/src/lib/components/chat/ChatControls.svelte
index f5889869a..780cd86a4 100644
--- a/src/lib/components/chat/ChatControls.svelte
+++ b/src/lib/components/chat/ChatControls.svelte
@@ -18,7 +18,6 @@
 	export let models = [];
 
 	export let chatId = null;
-	export let messages = [];
 
 	export let chatFiles = [];
 	export let params = {};
@@ -126,7 +125,7 @@
 							/>
 						</div>
 					{:else if $showArtifacts}
-						<Artifacts {messages} />
+						<Artifacts {history} />
 					{:else if $showOverview}
 						<Overview
 							{history}
@@ -201,7 +200,7 @@
 								/>
 							</div>
 						{:else if $showArtifacts}
-							<Artifacts {messages} overlay={dragged} />
+							<Artifacts {history} overlay={dragged} />
 						{:else if $showOverview}
 							<Overview
 								{history}
diff --git a/src/lib/components/chat/Messages.svelte b/src/lib/components/chat/Messages.svelte
index e78708341..a8152e71a 100644
--- a/src/lib/components/chat/Messages.svelte
+++ b/src/lib/components/chat/Messages.svelte
@@ -80,6 +80,7 @@
 
 	const updateChatHistory = async () => {
 		await tick();
+		history = history;
 		await updateChatById(localStorage.token, chatId, {
 			history: history,
 			messages: messages