diff --git a/prisma/mysql-schema.prisma b/prisma/mysql-schema.prisma
index d08bf897..6d68ec95 100644
--- a/prisma/mysql-schema.prisma
+++ b/prisma/mysql-schema.prisma
@@ -131,6 +131,8 @@ model Contact {
   updatedAt     DateTime? @updatedAt @db.Timestamp
   Instance      Instance  @relation(fields: [instanceId], references: [id], onDelete: Cascade)
   instanceId    String
+
+  @@unique([remoteJid, instanceId])
 }
 
 model Message {
diff --git a/prisma/postgresql-migrations/20240811183328_add_unique_index_for_remoted_jid_and_instance_in_contacts/migration.sql b/prisma/postgresql-migrations/20240811183328_add_unique_index_for_remoted_jid_and_instance_in_contacts/migration.sql
new file mode 100644
index 00000000..b0289bb2
--- /dev/null
+++ b/prisma/postgresql-migrations/20240811183328_add_unique_index_for_remoted_jid_and_instance_in_contacts/migration.sql
@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - A unique constraint covering the columns `[remoteJid,instanceId]` on the table `Contact` will be added. If there are existing duplicate values, this will fail.
+
+*/
+-- CreateIndex
+CREATE UNIQUE INDEX "Contact_remoteJid_instanceId_key" ON "Contact"("remoteJid", "instanceId");
diff --git a/prisma/postgresql-schema.prisma b/prisma/postgresql-schema.prisma
index fcd54b50..be71597d 100644
--- a/prisma/postgresql-schema.prisma
+++ b/prisma/postgresql-schema.prisma
@@ -131,6 +131,8 @@ model Contact {
   updatedAt     DateTime? @updatedAt @db.Timestamp
   Instance      Instance  @relation(fields: [instanceId], references: [id], onDelete: Cascade)
   instanceId    String
+
+  @@unique([remoteJid, instanceId])
 }
 
 model Message {
diff --git a/src/api/services/channels/whatsapp.baileys.service.ts b/src/api/services/channels/whatsapp.baileys.service.ts
index 3cde5fc4..addbfde4 100644
--- a/src/api/services/channels/whatsapp.baileys.service.ts
+++ b/src/api/services/channels/whatsapp.baileys.service.ts
@@ -730,6 +730,7 @@ export class BaileysStartupService extends ChannelStartupService {
         if (this.configService.get<Database>('DATABASE').SAVE_DATA.CHATS)
           await this.prismaRepository.chat.createMany({
             data: chatsToInsert,
+            skipDuplicates: true,
           });
       }
     },
@@ -849,7 +850,12 @@ export class BaileysStartupService extends ChannelStartupService {
     },
 
     'contacts.update': async (contacts: Partial<Contact>[]) => {
-      const contactsRaw: any = [];
+      const contactsRaw: {
+        remoteJid: string;
+        pushName?: string;
+        profilePicUrl?: string;
+        instanceId: string;
+      }[] = [];
       for await (const contact of contacts) {
         contactsRaw.push({
           remoteJid: contact.id,
@@ -861,10 +867,14 @@ export class BaileysStartupService extends ChannelStartupService {
 
       this.sendDataWebhook(Events.CONTACTS_UPDATE, contactsRaw);
 
-      this.prismaRepository.contact.updateMany({
-        where: { instanceId: this.instanceId },
-        data: contactsRaw,
-      });
+      const updateTransactions = contactsRaw.map((contact) =>
+        this.prismaRepository.contact.upsert({
+          where: { remoteJid_instanceId: { remoteJid: contact.remoteJid, instanceId: contact.instanceId } },
+          create: contact,
+          update: contact,
+        }),
+      );
+      await this.prismaRepository.$transaction(updateTransactions);
     },
   };
 
@@ -1253,19 +1263,19 @@ export class BaileysStartupService extends ChannelStartupService {
             where: { remoteJid: received.key.remoteJid, instanceId: this.instanceId },
           });
 
-          const contactRaw: any = {
+          const contactRaw: { remoteJid: string; pushName: string; profilePicUrl?: string; instanceId: string } = {
             remoteJid: received.key.remoteJid,
             pushName: received.pushName,
             profilePicUrl: (await this.profilePicture(received.key.remoteJid)).profilePictureUrl,
             instanceId: this.instanceId,
           };
 
-          if (contactRaw.id === 'status@broadcast') {
+          if (contactRaw.remoteJid === 'status@broadcast') {
             return;
           }
 
           if (contact) {
-            const contactRaw: any = {
+            const contactRaw: { remoteJid: string; pushName: string; profilePicUrl?: string; instanceId: string } = {
               remoteJid: received.key.remoteJid,
               pushName: contact.pushName,
               profilePicUrl: (await this.profilePicture(received.key.remoteJid)).profilePictureUrl,
@@ -1292,8 +1302,15 @@ export class BaileysStartupService extends ChannelStartupService {
           this.sendDataWebhook(Events.CONTACTS_UPSERT, contactRaw);
 
           if (this.configService.get<Database>('DATABASE').SAVE_DATA.CONTACTS)
-            await this.prismaRepository.contact.create({
-              data: contactRaw,
+            await this.prismaRepository.contact.upsert({
+              where: {
+                remoteJid_instanceId: {
+                  remoteJid: contactRaw.remoteJid,
+                  instanceId: contactRaw.instanceId,
+                },
+              },
+              update: contactRaw,
+              create: contactRaw,
             });
         }
       } catch (error) {