diff --git a/src/lib/Chat.svelte b/src/lib/Chat.svelte
index 62015a5..918ac82 100644
--- a/src/lib/Chat.svelte
+++ b/src/lib/Chat.svelte
@@ -62,11 +62,12 @@
   let lastSubmitRecorded = false
 
   $: chat = $chatsStorage.find((chat) => chat.id === chatId) as Chat
-  $: chatSettings = chat.settings
+  $: chatSettings = chat?.settings
   let showSettingsModal
 
   let scDelay
   const onStateChange = (...args:any) => {
+    if (!chat) return
     clearTimeout(scDelay)
     setTimeout(() => {
       if (chat.startSession) {
@@ -109,6 +110,7 @@
   })
 
   onMount(async () => {
+    if (!chat) return
     // Focus the input on mount
     focusInput()
 
@@ -585,7 +587,7 @@
   }
 
 </script>
-
+{#if chat}
 <ChatSettingsModal chatId={chatId} bind:show={showSettingsModal} />
 
 <div class="chat-content">
@@ -674,3 +676,4 @@
     {/each}
   </div>
 </Footer>
+{/if}
\ No newline at end of file
diff --git a/src/lib/ChatOptionMenu.svelte b/src/lib/ChatOptionMenu.svelte
index af4323b..c24fbfb 100644
--- a/src/lib/ChatOptionMenu.svelte
+++ b/src/lib/ChatOptionMenu.svelte
@@ -81,6 +81,7 @@
       confirmButtonClass: 'is-danger',
       confirmButton: 'Delete ALL',
       onConfirm: () => {
+        replace('/').then(() => { deleteChat(chatId) })
         clearChats()
       }
     })