diff --git a/src/lib/components/chat/MessageInput.svelte b/src/lib/components/chat/MessageInput.svelte
index 099f1dcec..bb5250def 100644
--- a/src/lib/components/chat/MessageInput.svelte
+++ b/src/lib/components/chat/MessageInput.svelte
@@ -691,7 +691,7 @@
 								/>
 
 								<div class="self-end mb-2 flex space-x-1 mr-1">
-									{#if !history?.currentId || history.messages[history.currentId].done == true}
+									{#if !history?.currentId || history.messages[history.currentId]?.done == true}
 										<Tooltip content={$i18n.t('Record voice')}>
 											<button
 												id="voice-input-button"
@@ -743,7 +743,7 @@
 							</div>
 						</div>
 						<div class="flex items-end w-10">
-							{#if !history.currentId || history.messages[history.currentId].done == true}
+							{#if !history.currentId || history.messages[history.currentId]?.done == true}
 								{#if prompt === ''}
 									<div class=" flex items-center mb-1">
 										<Tooltip content={$i18n.t('Call')}>
diff --git a/src/lib/components/chat/Messages.svelte b/src/lib/components/chat/Messages.svelte
index 7e914ae9d..d159e80f9 100644
--- a/src/lib/components/chat/Messages.svelte
+++ b/src/lib/components/chat/Messages.svelte
@@ -337,9 +337,13 @@
 							messageId={message.id}
 							idx={messageIdx}
 							{user}
+							{showPreviousMessage}
+							{showNextMessage}
 							{editMessage}
 							{deleteMessage}
 							{rateMessage}
+							{regenerateResponse}
+							{continueResponse}
 						/>
 					{/each}
 				</div>