diff --git a/src/lib/components/chat/Settings/DataControls.svelte b/src/lib/components/chat/Settings/DataControls.svelte
index e20aa72df2..017e782eb2 100644
--- a/src/lib/components/chat/Settings/DataControls.svelte
+++ b/src/lib/components/chat/Settings/DataControls.svelte
@@ -3,6 +3,7 @@
 	const { saveAs } = fileSaver;
 
 	import {
+		chatId,
 		chats,
 		user,
 		settings,
@@ -139,7 +140,12 @@
 	};
 </script>
 
-<ArchivedChatsModal bind:show={showArchivedChatsModal} onUpdate={handleArchivedChatsChange} />
+<ArchivedChatsModal bind:show={showArchivedChatsModal} onUpdate={handleArchivedChatsChange} onDelete={(id) => {
+	if ($chatId === id) {
+		goto('/');
+		chatId.set('');
+	}
+}} />
 <SharedChatsModal bind:show={showSharedChatsModal} />
 <FilesModal bind:show={showFilesModal} />
 
diff --git a/src/lib/components/layout/Sidebar.svelte b/src/lib/components/layout/Sidebar.svelte
index e7822e8c94..307744ade2 100644
--- a/src/lib/components/layout/Sidebar.svelte
+++ b/src/lib/components/layout/Sidebar.svelte
@@ -594,8 +594,8 @@
 	}}
 	onDelete={(id) => {
 		if ($chatId === id) {
+			goto('/');
 			chatId.set('');
-			window.history.replaceState({}, '', '/');
 		}
 	}}
 />