diff --git a/src/lib/components/chat/Messages/CodeBlock.svelte b/src/lib/components/chat/Messages/CodeBlock.svelte
index a9efc7fa9..5d7ae3f8e 100644
--- a/src/lib/components/chat/Messages/CodeBlock.svelte
+++ b/src/lib/components/chat/Messages/CodeBlock.svelte
@@ -148,7 +148,7 @@
 
 			executing = true;
 
-			document.pyodideMplTarget = document.getElementById('plt-canvas');
+			document.pyodideMplTarget = document.getElementById(`plt-canvas-${id}`);
 
 			let pyodide = await loadPyodide({
 				indexURL: '/pyodide/',
@@ -314,6 +314,6 @@ __builtins__.input = input`);
 			</div>
 		{/if}
 
-		<div id="plt-canvas" />
+		<div id="plt-canvas-{id}" />
 	</div>
 {/if}
diff --git a/src/lib/components/chat/Messages/ResponseMessage.svelte b/src/lib/components/chat/Messages/ResponseMessage.svelte
index 13b2ab6c7..66268f51e 100644
--- a/src/lib/components/chat/Messages/ResponseMessage.svelte
+++ b/src/lib/components/chat/Messages/ResponseMessage.svelte
@@ -434,10 +434,10 @@
 							{:else if message.content === ''}
 								<Skeleton />
 							{:else}
-								{#each tokens as token}
+								{#each tokens as token, tokenIdx}
 									{#if token.type === 'code'}
 										<CodeBlock
-											id={message.id}
+											id={`${message.id}-${tokenIdx}`}
 											lang={token.lang}
 											code={revertSanitizedResponseContent(token.text)}
 										/>