diff --git a/src/components/ConversationView/index.tsx b/src/components/ConversationView/index.tsx
index 58000d5..b0e4e5c 100644
--- a/src/components/ConversationView/index.tsx
+++ b/src/components/ConversationView/index.tsx
@@ -150,18 +150,6 @@ const ConversationView = () => {
     };
     messageStore.addMessage(userMessage);
 
-    // Add PENDING assistant message to the store.
-    const assistantMessage: Message = {
-      id: generateUUID(),
-      conversationId: currentConversation.id,
-      creatorId: currentConversation.assistantId,
-      creatorRole: CreatorRole.Assistant,
-      createdAt: Date.now(),
-      content: "",
-      status: "LOADING",
-    };
-    messageStore.addMessage(assistantMessage);
-
     // Construct the system prompt
     const messageList = messageStore
       .getState()
@@ -264,13 +252,30 @@ const ConversationView = () => {
       } catch (error) {
         // do nth
       }
-      messageStore.updateMessage(assistantMessage.id, {
+      messageStore.addMessage({
+        id: generateUUID(),
+        conversationId: currentConversation.id,
+        creatorId: currentConversation.assistantId,
+        creatorRole: CreatorRole.Assistant,
+        createdAt: Date.now(),
         content: errorMessage,
         status: "FAILED",
       });
       return;
     }
 
+    // Add PENDING assistant message to the store.
+    const assistantMessage: Message = {
+      id: generateUUID(),
+      conversationId: currentConversation.id,
+      creatorId: currentConversation.assistantId,
+      creatorRole: CreatorRole.Assistant,
+      createdAt: Date.now(),
+      content: "",
+      status: "LOADING",
+    };
+    messageStore.addMessage(assistantMessage);
+
     const data = rawRes.body;
     if (!data) {
       toast.error("No data return");