diff --git a/packages/bot/core/core.class.js b/packages/bot/core/core.class.js
index c68d649..9b329cc 100644
--- a/packages/bot/core/core.class.js
+++ b/packages/bot/core/core.class.js
@@ -122,13 +122,7 @@ class CoreClass {
             endFlowFlag = true
             if (message)
                 this.sendProviderAndSave(from, createCtxMessage(message))
-
             clearQueue()
-            if (message)
-                this.sendProviderAndSave(from, {
-                    ...prevMsg,
-                    answer: message ?? prevMsg.answer,
-                })
             return
         }
 
@@ -171,7 +165,14 @@ class CoreClass {
             if (next) return continueFlow()
             return this.sendProviderAndSave(from, {
                 ...prevMsg,
-                answer: message ?? prevMsg.answer,
+                answer:
+                    typeof message === 'string'
+                        ? message
+                        : message?.body ?? prevMsg.answer,
+                options: {
+                    ...prevMsg.options,
+                    buttons: message?.buttons ?? prevMsg.options?.buttons,
+                },
             })
         }
 
diff --git a/packages/bot/package.json b/packages/bot/package.json
index 827194b..3d4acf3 100644
--- a/packages/bot/package.json
+++ b/packages/bot/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@bot-whatsapp/bot",
-    "version": "0.0.86-alpha.0",
+    "version": "0.0.91-alpha.0",
     "description": "",
     "main": "./lib/bundle.bot.cjs",
     "scripts": {