diff --git a/src/main/java/it/auties/whatsapp/api/Whatsapp.java b/src/main/java/it/auties/whatsapp/api/Whatsapp.java
index b8c05869..c79f08de 100644
--- a/src/main/java/it/auties/whatsapp/api/Whatsapp.java
+++ b/src/main/java/it/auties/whatsapp/api/Whatsapp.java
@@ -583,7 +583,7 @@ public CompletableFuture<ChatMessageInfo> sendChatMessage(JidProvider recipient,
                 .status(MessageStatus.PENDING)
                 .senderJid(jidOrThrowError())
                 .key(key)
-                .message(message.withDeviceInfo(deviceInfo))
+                .message(recipient.toJid().hasServer(JidServer.GROUP) ? message : message.withDeviceInfo(deviceInfo))
                 .timestampSeconds(timestamp)
                 .broadcast(recipient.toJid().hasServer(JidServer.BROADCAST))
                 .build();