diff --git a/apps/desktop/src/chat/ChatWidget.tsx b/apps/desktop/src/chat/ChatWidget.tsx
index af70455..acacacd 100644
--- a/apps/desktop/src/chat/ChatWidget.tsx
+++ b/apps/desktop/src/chat/ChatWidget.tsx
@@ -612,7 +612,7 @@ export function ChatWidget({ ticketId, ticketRef }: ChatWidgetProps) {
     setIsSending(true)
 
     try {
-      const bodyToSend = messageText || (attachmentsToSend.length > 0 ? "[Anexo]" : "")
+      const bodyToSend = messageText
       const cfg = await ensureConfig()
       await invoke("send_chat_message", {
         baseUrl: cfg.apiBaseUrl,
@@ -814,6 +814,9 @@ export function ChatWidget({ ticketId, ticketRef }: ChatWidgetProps) {
               // No desktop: isFromMachine=true significa mensagem do cliente (maquina)
               // Layout igual à web: cliente à esquerda, agente à direita
               const isAgent = !msg.isFromMachine
+              const bodyText = msg.body.trim()
+              const shouldShowBody =
+                bodyText.length > 0 && !(bodyText === "[Anexo]" && (msg.attachments?.length ?? 0) > 0)
               return (
                 <div key={msg.id} className="space-y-2">
                   {firstUnreadAgentMessageId === msg.id && unreadCount > 0 && !isAtBottom && (
@@ -856,7 +859,7 @@ export function ChatWidget({ ticketId, ticketRef }: ChatWidgetProps) {
                         {msg.authorName}
                       </p>
                     )}
-                    <p className="whitespace-pre-wrap text-sm">{msg.body}</p>
+                    {shouldShowBody && <p className="whitespace-pre-wrap text-sm">{msg.body}</p>}
                     {/* Anexos */}
                     {msg.attachments && msg.attachments.length > 0 && (
                       <div className="mt-2 space-y-2">
diff --git a/src/app/api/machines/chat/messages/route.ts b/src/app/api/machines/chat/messages/route.ts
index 4fff30b..e431795 100644
--- a/src/app/api/machines/chat/messages/route.ts
+++ b/src/app/api/machines/chat/messages/route.ts
@@ -14,21 +14,33 @@ const getMessagesSchema = z.object({
   limit: z.number().optional(),
 })
 
-const postMessageSchema = z.object({
-  machineToken: z.string().min(1),
-  ticketId: z.string().min(1),
-  body: z.string().min(1).max(4000),
-  attachments: z
-    .array(
-      z.object({
-        storageId: z.string(),
-        name: z.string(),
-        size: z.number().optional(),
-        type: z.string().optional(),
+const postMessageSchema = z
+  .object({
+    machineToken: z.string().min(1),
+    ticketId: z.string().min(1),
+    body: z.string().max(4000).optional(),
+    attachments: z
+      .array(
+        z.object({
+          storageId: z.string(),
+          name: z.string(),
+          size: z.number().optional(),
+          type: z.string().optional(),
+        })
+      )
+      .optional(),
+  })
+  .superRefine((value, ctx) => {
+    const body = (value.body ?? "").trim()
+    const hasAttachments = (value.attachments?.length ?? 0) > 0
+    if (body.length === 0 && !hasAttachments) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: "Mensagem vazia",
+        path: ["body"],
       })
-    )
-    .optional(),
-})
+    }
+  })
 
 const CORS_METHODS = "POST, OPTIONS"
 
@@ -123,14 +135,18 @@ export async function POST(request: Request) {
     }
 
     try {
+      const body = (payload.body ?? "").trim()
+      const attachments =
+        payload.attachments && payload.attachments.length > 0 ? payload.attachments : undefined
+
       // Retry com backoff exponencial para falhas transientes
       const result = await withRetry(
         () =>
           client.mutation(api.liveChat.postMachineMessage, {
             machineToken: payload.machineToken,
             ticketId: payload.ticketId as Id<"tickets">,
-            body: payload.body,
-            attachments: payload.attachments as
+            body,
+            attachments: attachments as
               | Array<{
                   storageId: Id<"_storage">
                   name: string
diff --git a/src/components/chat/chat-widget.tsx b/src/components/chat/chat-widget.tsx
index e8aee90..dd781c4 100644
--- a/src/components/chat/chat-widget.tsx
+++ b/src/components/chat/chat-widget.tsx
@@ -759,6 +759,10 @@ export function ChatWidget() {
               <div className="space-y-3">
                 {messages.map((msg) => {
                   const isOwn = String(msg.authorId) === String(viewerId)
+                  const bodyText = msg.body?.trim() ?? ""
+                  const shouldShowBody =
+                    bodyText.length > 0 &&
+                    !(bodyText === "[Anexo]" && (msg.attachments?.length ?? 0) > 0)
                   return (
                     <div
                       key={msg.id}
@@ -785,9 +789,7 @@ export function ChatWidget() {
                             {msg.authorName ?? "Cliente"}
                           </p>
                         )}
-                        {msg.body && (
-                          <p className="whitespace-pre-wrap text-sm">{msg.body}</p>
-                        )}
+                        {shouldShowBody && <p className="whitespace-pre-wrap text-sm">{msg.body}</p>}
                         {/* Anexos da mensagem */}
                         {msg.attachments && msg.attachments.length > 0 && (
                           <div className={cn("mt-2 flex flex-wrap gap-1.5", isOwn && "justify-end")}>