diff --git a/src/whatsapp/services/whatsapp.service.ts b/src/whatsapp/services/whatsapp.service.ts
index 3aa669e1..c49df6bf 100644
--- a/src/whatsapp/services/whatsapp.service.ts
+++ b/src/whatsapp/services/whatsapp.service.ts
@@ -2457,21 +2457,6 @@ export class WAStartupService {
               option as unknown as MiscMessageGenerationOptions,
             );
           }
-
-          if (!message['audio']) {
-            this.logger.verbose('Sending message');
-            return await this.client.sendMessage(
-              sender,
-              {
-                forward: {
-                  key: { remoteJid: this.instance.wuid, fromMe: true },
-                  message,
-                },
-                mentions,
-              },
-              option as unknown as MiscMessageGenerationOptions,
-            );
-          }
         }
         if (message['conversation']) {
           this.logger.verbose('Sending message');
@@ -2486,6 +2471,21 @@ export class WAStartupService {
           );
         }
 
+        if (!message['audio'] && sender != 'status@broadcast') {
+          this.logger.verbose('Sending message');
+          return await this.client.sendMessage(
+            sender,
+            {
+              forward: {
+                key: { remoteJid: this.instance.wuid, fromMe: true },
+                message,
+              },
+              mentions,
+            },
+            option as unknown as MiscMessageGenerationOptions,
+          );
+        }
+
         if (sender === 'status@broadcast') {
           this.logger.verbose('Sending message');
           return await this.client.sendMessage(
@@ -3138,6 +3138,8 @@ export class WAStartupService {
         if (!group) throw new BadRequestException('Group not found');
 
         onWhatsapp.push(new OnWhatsAppDto(group.id, !!group?.id, group?.subject));
+      } else if (jid === 'status@broadcast') {
+        onWhatsapp.push(new OnWhatsAppDto(jid, false));
       } else {
         jid = !jid.startsWith('+') ? `+${jid}` : jid;
         const verify = await this.client.onWhatsApp(jid);