diff --git a/prisma/mysql-schema.prisma b/prisma/mysql-schema.prisma
index ed82c7e7..d08bf897 100644
--- a/prisma/mysql-schema.prisma
+++ b/prisma/mysql-schema.prisma
@@ -114,6 +114,7 @@ model Session {
 model Chat {
   id         String    @id @default(cuid())
   remoteJid  String    @db.VarChar(100)
+  name       String?   @db.VarChar(100)
   labels     Json?     @db.Json
   createdAt  DateTime? @default(dbgenerated("CURRENT_TIMESTAMP")) @db.Timestamp
   updatedAt  DateTime? @updatedAt @db.Timestamp
diff --git a/prisma/postgresql-schema.prisma b/prisma/postgresql-schema.prisma
index c245ed9d..fcd54b50 100644
--- a/prisma/postgresql-schema.prisma
+++ b/prisma/postgresql-schema.prisma
@@ -114,6 +114,7 @@ model Session {
 model Chat {
   id         String    @id @default(cuid())
   remoteJid  String    @db.VarChar(100)
+  name       String?   @db.VarChar(100)
   labels     Json?     @db.JsonB
   createdAt  DateTime? @default(now()) @db.Timestamp
   updatedAt  DateTime? @updatedAt @db.Timestamp
diff --git a/src/api/services/channels/whatsapp.baileys.service.ts b/src/api/services/channels/whatsapp.baileys.service.ts
index 21b528be..b37b8275 100644
--- a/src/api/services/channels/whatsapp.baileys.service.ts
+++ b/src/api/services/channels/whatsapp.baileys.service.ts
@@ -722,7 +722,7 @@ export class BaileysStartupService extends ChannelStartupService {
 
       const chatsToInsert = chats
         .filter((chat) => !existingChatIdSet.has(chat.id))
-        .map((chat) => ({ remoteJid: chat.id, instanceId: this.instanceId }));
+        .map((chat) => ({ remoteJid: chat.id, instanceId: this.instanceId, name: chat.name }));
 
       this.sendDataWebhook(Events.CHATS_UPSERT, chatsToInsert);
 
@@ -754,10 +754,9 @@ export class BaileysStartupService extends ChannelStartupService {
           where: {
             instanceId: this.instanceId,
             remoteJid: chat.id,
+            name: chat.name,
           },
-          data: {
-            remoteJid: chat.id,
-          },
+          data: { remoteJid: chat.id },
         });
       }
     },
@@ -900,7 +899,7 @@ export class BaileysStartupService extends ChannelStartupService {
           }
         }
 
-        const chatsRaw: any[] = [];
+        const chatsRaw: { remoteJid: string; instanceId: string; name?: string }[] = [];
         const chatsRepository = new Set(
           (
             await this.prismaRepository.chat.findMany({
@@ -917,6 +916,7 @@ export class BaileysStartupService extends ChannelStartupService {
           chatsRaw.push({
             remoteJid: chat.id,
             instanceId: this.instanceId,
+            name: chat.name,
           });
         }