diff --git a/src/lib/components/chat/Artifacts.svelte b/src/lib/components/chat/Artifacts.svelte
index 943c6d6a7a..d0a6e195ee 100644
--- a/src/lib/components/chat/Artifacts.svelte
+++ b/src/lib/components/chat/Artifacts.svelte
@@ -109,6 +109,8 @@
 				selectedContentIdx = 0;
 			} else if (newContents.length > contents.length) {
 				selectedContentIdx = newContents.length - 1;
+			} else if (selectedContentIdx > newContents.length - 1) {
+				selectedContentIdx = newContents.length - 1;
 			}
 
 			contents = newContents;