diff --git a/src/api/services/channel.service.ts b/src/api/services/channel.service.ts
index d4aa6a19..5d079b69 100644
--- a/src/api/services/channel.service.ts
+++ b/src/api/services/channel.service.ts
@@ -614,9 +614,7 @@ export class ChannelStartupService {
         : this.createJid(query.where?.remoteJid)
       : null;
 
-    let result;
-    if (remoteJid) {
-      result = await this.prismaRepository.$queryRaw`
+    const result = await this.prismaRepository.$queryRaw`
             SELECT
                 "Chat"."id",
                 "Chat"."remoteJid",
@@ -625,13 +623,13 @@ export class ChannelStartupService {
                 "Chat"."createdAt",
                 "Chat"."updatedAt",
                 "Contact"."pushName",
-                "Contact"."profilePicUrl"
+                "Contact"."profilePicUrl",
                 "Contact"."unreadMessages"
             FROM "Chat"
             INNER JOIN "Message" ON "Chat"."remoteJid" = "Message"."key"->>'remoteJid'
             LEFT JOIN "Contact" ON "Chat"."remoteJid" = "Contact"."remoteJid"
             WHERE "Chat"."instanceId" = ${this.instanceId}
-            AND "Chat"."remoteJid" = ${remoteJid}
+            ${remoteJid ? 'AND "Chat"."remoteJid" = ${remoteJid}' : ''}
             GROUP BY
                 "Chat"."id",
                 "Chat"."remoteJid",
@@ -644,35 +642,6 @@ export class ChannelStartupService {
                 "Contact"."unreadMessages"
             ORDER BY "Chat"."updatedAt" DESC;
         `;
-    } else {
-      result = await this.prismaRepository.$queryRaw`
-            SELECT
-                "Chat"."id",
-                "Chat"."remoteJid",
-                "Chat"."name",
-                "Chat"."labels",
-                "Chat"."createdAt",
-                "Chat"."updatedAt",
-                "Contact"."pushName",
-                "Contact"."profilePicUrl"
-                "Contact"."unreadMessages"
-            FROM "Chat"
-            INNER JOIN "Message" ON "Chat"."remoteJid" = "Message"."key"->>'remoteJid'
-            LEFT JOIN "Contact" ON "Chat"."remoteJid" = "Contact"."remoteJid"
-            WHERE "Chat"."instanceId" = ${this.instanceId}
-            GROUP BY
-                "Chat"."id",
-                "Chat"."remoteJid",
-                "Chat"."name",
-                "Chat"."labels",
-                "Chat"."createdAt",
-                "Chat"."updatedAt",
-                "Contact"."pushName",
-                "Contact"."profilePicUrl"
-                "Contact"."unreadMessages"
-            ORDER BY "Chat"."updatedAt" DESC;
-        `;
-    }
 
     return result;
   }