diff --git a/src/conversations/conversations.service.ts b/src/conversations/conversations.service.ts
index 11c1ba09..d9371de3 100644
--- a/src/conversations/conversations.service.ts
+++ b/src/conversations/conversations.service.ts
@@ -220,23 +220,11 @@ export class ConversationsService {
       return detail;
     }
 
-    const system_message: Message = messages[0];
-    if (system_message.message.role !== OpenAIMessageRole.SYSTEM) {
-      const message = this.i18n.t('system.errors.firstMessageNotSystem');
-      throw new AppException(
-        message,
-        'FIRST_MESSAGE_NOT_SYSTEM',
-        HttpStatus.INTERNAL_SERVER_ERROR,
-      );
-    }
     const childrenMap: Record<string, string[]> = {};
     for (const msg of messages) {
-      if (msg.id === system_message.id) {
+      if (msg.message.role === OpenAIMessageRole.SYSTEM) {
         continue;
       }
-      if (msg.parentId === system_message.id) {
-        msg.parentId = null;
-      }
       if (msg.parentId) {
         if (!childrenMap[msg.parentId]) {
           childrenMap[msg.parentId] = [];
@@ -245,7 +233,7 @@ export class ConversationsService {
       }
     }
     for (const msg of messages) {
-      if (msg.id === system_message.id) {
+      if (msg.message.role === OpenAIMessageRole.SYSTEM) {
         continue;
       }
       detail.mapping[msg.id] = {
diff --git a/src/wizard/stream.service.ts b/src/wizard/stream.service.ts
index ad547185..8f023f61 100644
--- a/src/wizard/stream.service.ts
+++ b/src/wizard/stream.service.ts
@@ -137,10 +137,6 @@ export class StreamService {
         chunk.userId = userId || undefined;
         chunk.namespaceId = namespaceId;
 
-        if (context.message?.role === OpenAIMessageRole.SYSTEM) {
-          chunk.parentId = undefined;
-        }
-
         context.messageId = message.id;
         context.message = message.message;
       } else if (chunk.response_type === 'delta') {