diff --git a/src/Utils/messages.ts b/src/Utils/messages.ts
index 2f845d9..7d1a3a3 100644
--- a/src/Utils/messages.ts
+++ b/src/Utils/messages.ts
@@ -235,12 +235,11 @@ export const generateWAMessageContent = async(
 	}
 	if('buttons' in message && !!message.buttons) {
 		const buttonsMessage: proto.IButtonsMessage = {
-			buttons: message.buttons!,
-			text: ''
+			buttons: message.buttons!.map(b => ({ ...b, type: proto.Button.ButtonType.RESPONSE }))
 		}
 		if('text' in message) {
 			buttonsMessage.contentText = message.text
-			buttonsMessage.headerType = ButtonType.TEXT
+			buttonsMessage.headerType = ButtonType.EMPTY
 		} else {
 			if('caption' in message) {
 				buttonsMessage.contentText = message.caption