diff --git a/src/Utils/messages.ts b/src/Utils/messages.ts
index 491cc0c..0ceab16 100644
--- a/src/Utils/messages.ts
+++ b/src/Utils/messages.ts
@@ -342,6 +342,11 @@ export const generateWAMessage = async(
  * Eg. extracts the inner message from a disappearing message/view once message
  */
 export const extractMessageContent = (content: WAMessageContent | undefined | null): WAMessageContent | undefined => {
+	content = content?.ephemeralMessage?.message || 
+				content?.viewOnceMessage?.message ||
+				content || 
+				undefined
+
 	if(content?.buttonsMessage) {
 	  const { buttonsMessage } = content
 	  if(buttonsMessage.imageMessage) {
@@ -355,10 +360,6 @@ export const extractMessageContent = (content: WAMessageContent | undefined | nu
 	  } else {
 		return { conversation: buttonsMessage.contentText }
 	  }
-	} else {
-	  return content?.ephemeralMessage?.message || 
-			 content?.viewOnceMessage?.message ||
-			 content || 
-			 undefined
 	}
-  }
\ No newline at end of file
+	return content
+}
\ No newline at end of file