diff --git a/client/src/components/Messages/Message.jsx b/client/src/components/Messages/Message.jsx
index 802883a484..ab605a8681 100644
--- a/client/src/components/Messages/Message.jsx
+++ b/client/src/components/Messages/Message.jsx
@@ -188,14 +188,14 @@ export default function Message({
                       )}
                     </div>
                   </div>
-                  {!submitting && cancelled ? (
+                  {!isSubmitting && cancelled ? (
                     <div className="flex flex min-h-[20px] flex-grow flex-col items-start gap-2 gap-4  text-red-500">
                       <div className="rounded-md border border-blue-400 bg-blue-500/10 px-3 py-2 text-sm text-gray-600 dark:text-gray-100">
                         {`This is a cancelled message.`}
                       </div>
                     </div>
                   ) : null}
-                  {!submitting && unfinished ? (
+                  {!isSubmitting && unfinished ? (
                     <div className="flex flex min-h-[20px] flex-grow flex-col items-start gap-2 gap-4  text-red-500">
                       <div className="rounded-md border border-blue-400 bg-blue-500/10 px-3 py-2 text-sm text-gray-600 dark:text-gray-100">
                         {`This is an unfinished message. It might because the AI is still generating or it has been aborted. Refresh later to see more updates.`}
diff --git a/client/src/utils/handleSubmit.js b/client/src/utils/handleSubmit.js
index 4001aff409..53461a540c 100644
--- a/client/src/utils/handleSubmit.js
+++ b/client/src/utils/handleSubmit.js
@@ -106,6 +106,7 @@ const useMessageHandler = () => {
       parentMessageId: isRegenerate ? messageId : fakeMessageId,
       messageId: (isRegenerate ? messageId : fakeMessageId) + '_',
       conversationId,
+      unfinished: true,
       submitting: true
     };