diff --git a/client/src/components/MessageHandler/index.jsx b/client/src/components/MessageHandler/index.jsx
index 9f79c3aac6..b51426503b 100644
--- a/client/src/components/MessageHandler/index.jsx
+++ b/client/src/components/MessageHandler/index.jsx
@@ -17,7 +17,7 @@ export default function MessageHandler() {
   const messageHandler = (data, submission) => {
     const { messages, message, initialResponse, isRegenerate = false } = submission;
 
-    if (isRegenerate)
+    if (isRegenerate) {
       setMessages([
         ...messages,
         {
@@ -26,10 +26,10 @@ export default function MessageHandler() {
           parentMessageId: message?.overrideParentMessageId,
           messageId: message?.overrideParentMessageId + '_',
           submitting: true,
-          unfinished: true
+          // unfinished: true
         }
       ]);
-    else
+    } else {
       setMessages([
         ...messages,
         message,
@@ -39,9 +39,10 @@ export default function MessageHandler() {
           parentMessageId: message?.messageId,
           messageId: message?.messageId + '_',
           submitting: true,
-          unfinished: true
+          // unfinished: true
         }
       ]);
+    }
   };
 
   const cancelHandler = (data, submission) => {
@@ -50,8 +51,11 @@ export default function MessageHandler() {
     const { requestMessage, responseMessage, conversation } = data;
 
     // update the messages
-    if (isRegenerate) setMessages([...messages, responseMessage]);
-    else setMessages([...messages, requestMessage, responseMessage]);
+    if (isRegenerate) {
+      setMessages([...messages, responseMessage]);
+    } else {
+      setMessages([...messages, requestMessage, responseMessage]);
+    }
     setIsSubmitting(false);
 
     // refresh title
diff --git a/client/src/components/Messages/Message.jsx b/client/src/components/Messages/Message.jsx
index a858f2aac9..4a15e793c2 100644
--- a/client/src/components/Messages/Message.jsx
+++ b/client/src/components/Messages/Message.jsx
@@ -34,6 +34,12 @@ export default function Message({
   const blinker = submitting && isSubmitting;
   const getConversationQuery = useGetConversationByIdQuery(message.conversationId, { enabled: false });
 
+  // debugging
+  // useEffect(() => {
+  //   console.log('isSubmitting:', isSubmitting);
+  //   console.log('unfinished:', unfinished);
+  // }, [isSubmitting, unfinished]);
+
   useEffect(() => {
     if (blinker && !abortScroll) {
       scrollToBottom();
diff --git a/client/src/utils/handleSubmit.js b/client/src/utils/handleSubmit.js
index 53461a540c..7df1830f61 100644
--- a/client/src/utils/handleSubmit.js
+++ b/client/src/utils/handleSubmit.js
@@ -106,7 +106,7 @@ const useMessageHandler = () => {
       parentMessageId: isRegenerate ? messageId : fakeMessageId,
       messageId: (isRegenerate ? messageId : fakeMessageId) + '_',
       conversationId,
-      unfinished: true,
+      unfinished: (endpoint === 'azureOpenAI' || endpoint === 'openAI') ? false : true,
       submitting: true
     };