diff --git a/src/api/integrations/channel/whatsapp/whatsapp.baileys.service.ts b/src/api/integrations/channel/whatsapp/whatsapp.baileys.service.ts
index 2c46aca4..bafefa18 100644
--- a/src/api/integrations/channel/whatsapp/whatsapp.baileys.service.ts
+++ b/src/api/integrations/channel/whatsapp/whatsapp.baileys.service.ts
@@ -1223,7 +1223,8 @@ export class BaileysStartupService extends ChannelStartupService {
             existingChat &&
             received.pushName &&
             existingChat.name !== received.pushName &&
-            received.pushName.trim().length > 0
+            received.pushName.trim().length > 0 &&
+            !received.key.remoteJid.includes('@g.us')
           ) {
             this.sendDataWebhook(Events.CHATS_UPSERT, [{ ...existingChat, name: received.pushName }]);
             if (this.configService.get<Database>('DATABASE').SAVE_DATA.CHATS) {
diff --git a/src/api/services/channel.service.ts b/src/api/services/channel.service.ts
index 0f30f0c9..6d03856e 100644
--- a/src/api/services/channel.service.ts
+++ b/src/api/services/channel.service.ts
@@ -503,9 +503,17 @@ export class ChannelStartupService {
       where['remoteJid'] = remoteJid;
     }
 
-    return await this.prismaRepository.contact.findMany({
+    const contactFindManyArgs: Prisma.ContactFindManyArgs = {
       where,
-    });
+    };
+
+    if (query.offset) contactFindManyArgs.take = query.offset;
+    if (query.page) {
+      const validPage = Math.max(query.page as number, 1);
+      contactFindManyArgs.skip = query.offset * (validPage - 1);
+    }
+
+    return await this.prismaRepository.contact.findMany(contactFindManyArgs);
   }
 
   public cleanMessageData(message: any) {
@@ -674,6 +682,13 @@ export class ChannelStartupService {
         : createJid(query.where?.remoteJid)
       : null;
 
+    const limit =
+      query.offset && !query.page
+        ? Prisma.sql` LIMIT ${query.offset}`
+        : query.offset && query.page
+          ? Prisma.sql`  LIMIT ${query.offset} OFFSET ${((query.page as number) - 1) * query.offset}`
+          : Prisma.sql``;
+
     const where = {
       instanceId: this.instanceId,
     };
@@ -700,6 +715,7 @@ export class ChannelStartupService {
               to_timestamp("Message"."messageTimestamp"::double precision), 
               "Contact"."updatedAt"
             ) as "updatedAt",
+            "Chat"."name" as "chatName",
             "Chat"."createdAt" as "windowStart",
             "Chat"."createdAt" + INTERVAL '24 hours' as "windowExpires",
             CASE 
@@ -730,6 +746,7 @@ export class ChannelStartupService {
           ORDER BY 
             "Contact"."remoteJid",
             "Message"."messageTimestamp" DESC
+            ${limit}
         )
         SELECT * FROM rankedMessages
         ORDER BY "updatedAt" DESC NULLS LAST;
@@ -758,6 +775,7 @@ export class ChannelStartupService {
           id: contact.id,
           remoteJid: contact.remoteJid,
           pushName: contact.pushName,
+          chatName: contact.chatName,
           profilePicUrl: contact.profilePicUrl,
           updatedAt: contact.updatedAt,
           windowStart: contact.windowStart,