diff --git a/web/hooks/useSendChatMessage.ts b/web/hooks/useSendChatMessage.ts
index e1c91cca2..d247120cf 100644
--- a/web/hooks/useSendChatMessage.ts
+++ b/web/hooks/useSendChatMessage.ts
@@ -38,6 +38,7 @@ import { loadModelErrorAtom, useActiveModel } from './useActiveModel'
 import { extensionManager } from '@/extension/ExtensionManager'
 import {
   addNewMessageAtom,
+  deleteMessageAtom,
   getCurrentChatMessagesAtom,
 } from '@/helpers/atoms/ChatMessage.atom'
 import {
@@ -58,6 +59,7 @@ export default function useSendChatMessage() {
   const updateThread = useSetAtom(updateThreadAtom)
   const updateThreadWaiting = useSetAtom(updateThreadWaitingForResponseAtom)
   const setCurrentPrompt = useSetAtom(currentPromptAtom)
+  const deleteMessage = useSetAtom(deleteMessageAtom)
   const setEditPrompt = useSetAtom(editPromptAtom)
 
   const currentMessages = useAtomValue(getCurrentChatMessagesAtom)
@@ -132,6 +134,19 @@ export default function useSendChatMessage() {
       await waitForModelStarting(modelId)
       setQueuedMessage(false)
     }
+
+    if (currentMessage.role !== ChatCompletionRole.User) {
+      // Delete last response before regenerating
+      deleteMessage(currentMessage.id ?? '')
+      if (activeThread) {
+        await extensionManager
+          .get<ConversationalExtension>(ExtensionTypeEnum.Conversational)
+          ?.writeMessages(
+            activeThread.id,
+            currentMessages.filter((msg) => msg.id !== currentMessage.id)
+          )
+      }
+    }
     events.emit(MessageEvent.OnMessageSent, messageRequest)
   }
 
diff --git a/web/screens/Chat/ErrorMessage/index.tsx b/web/screens/Chat/ErrorMessage/index.tsx
index ea9906335..56ea4847c 100644
--- a/web/screens/Chat/ErrorMessage/index.tsx
+++ b/web/screens/Chat/ErrorMessage/index.tsx
@@ -1,10 +1,4 @@
-import {
-  ChatCompletionRole,
-  ConversationalExtension,
-  ExtensionTypeEnum,
-  MessageStatus,
-  ThreadMessage,
-} from '@janhq/core'
+import { MessageStatus, ThreadMessage } from '@janhq/core'
 import { Button } from '@janhq/uikit'
 import { useAtomValue, useSetAtom } from 'jotai'
 import { RefreshCcw } from 'lucide-react'
@@ -15,39 +9,17 @@ import ModalTroubleShooting, {
 
 import useSendChatMessage from '@/hooks/useSendChatMessage'
 
-import { extensionManager } from '@/extension'
-import {
-  deleteMessageAtom,
-  getCurrentChatMessagesAtom,
-} from '@/helpers/atoms/ChatMessage.atom'
-import { activeThreadAtom } from '@/helpers/atoms/Thread.atom'
+import { getCurrentChatMessagesAtom } from '@/helpers/atoms/ChatMessage.atom'
 
 const ErrorMessage = ({ message }: { message: ThreadMessage }) => {
   const messages = useAtomValue(getCurrentChatMessagesAtom)
-  const thread = useAtomValue(activeThreadAtom)
-  const deleteMessage = useSetAtom(deleteMessageAtom)
   const { resendChatMessage } = useSendChatMessage()
   const setModalTroubleShooting = useSetAtom(modalTroubleShootingAtom)
 
   const regenerateMessage = async () => {
     const lastMessageIndex = messages.length - 1
     const message = messages[lastMessageIndex]
-    if (message.role !== ChatCompletionRole.User) {
-      // Delete last response before regenerating
-      deleteMessage(message.id ?? '')
-      if (thread) {
-        await extensionManager
-          .get<ConversationalExtension>(ExtensionTypeEnum.Conversational)
-          ?.writeMessages(
-            thread.id,
-            messages.filter((msg) => msg.id !== message.id)
-          )
-      }
-      const targetMessage = messages[lastMessageIndex - 1]
-      if (targetMessage) resendChatMessage(targetMessage)
-    } else {
-      resendChatMessage(message)
-    }
+    resendChatMessage(message)
   }
 
   return (
diff --git a/web/screens/Chat/MessageQueuedBanner/index.tsx b/web/screens/Chat/MessageQueuedBanner/index.tsx
deleted file mode 100644
index 5847394b4..000000000
--- a/web/screens/Chat/MessageQueuedBanner/index.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { useAtomValue } from 'jotai'
-
-import { queuedMessageAtom } from '@/hooks/useSendChatMessage'
-
-const MessageQueuedBanner: React.FC = () => {
-  const queuedMessage = useAtomValue(queuedMessageAtom)
-
-  return (
-    <div>
-      {queuedMessage && (
-        <div className="my-2 py-2 text-center">
-          <span className="rounded-lg border border-border px-4 py-2 shadow-lg">
-            Message queued. It can be sent once the model has started
-          </span>
-        </div>
-      )}
-    </div>
-  )
-}
-
-export default MessageQueuedBanner
diff --git a/web/screens/Chat/MessageToolbar/index.tsx b/web/screens/Chat/MessageToolbar/index.tsx
index ed73d5ecb..4cb00ccfa 100644
--- a/web/screens/Chat/MessageToolbar/index.tsx
+++ b/web/screens/Chat/MessageToolbar/index.tsx
@@ -57,10 +57,6 @@ const MessageToolbar = ({ message }: { message: ThreadMessage }) => {
   }
 
   const onRegenerateClick = async () => {
-    if (message.role !== ChatCompletionRole.User) {
-      // Delete last response before regenerating
-      await onDeleteClick()
-    }
     resendChatMessage(message)
   }