diff --git a/src/renderer/src/pages/home/Messages/MessageMenubar.tsx b/src/renderer/src/pages/home/Messages/MessageMenubar.tsx
index e6b94a2e..f119a220 100644
--- a/src/renderer/src/pages/home/Messages/MessageMenubar.tsx
+++ b/src/renderer/src/pages/home/Messages/MessageMenubar.tsx
@@ -96,9 +96,9 @@ const MessageMenubar: FC<Props> = (props) => {
       })
     }
 
-    if (!nextMessage) {
-      onDeleteMessage?.(message)
+    if (!nextMessage || nextMessage.role === 'user') {
       EventEmitter.emit(EVENT_NAMES.SEND_MESSAGE, { ...message, id: uuid() })
+      onDeleteMessage?.(message)
     }
   }, [assistantModel?.id, message, model?.id, onDeleteMessage, onGetMessages])