diff --git a/.changeset/fix_broken_messages_images.md b/.changeset/fix_broken_messages_images.md
new file mode 100644
index 00000000..cf180b43
--- /dev/null
+++ b/.changeset/fix_broken_messages_images.md
@@ -0,0 +1,5 @@
+---
+sable: patch
+---
+
+Fix images without an empty body display as "Broken Message"
diff --git a/src/app/components/RenderMessageContent.tsx b/src/app/components/RenderMessageContent.tsx
index 93a697c6..5d61faa4 100644
--- a/src/app/components/RenderMessageContent.tsx
+++ b/src/app/components/RenderMessageContent.tsx
@@ -120,8 +120,9 @@ function RenderMessageContentInternal({
   );
 
   const renderCaption = () => {
+    const hasCaption = content.body && content.body.trim().length > 0;
     if (captionPosition === CaptionPosition.Hidden) return null;
-    if (content.filename && content.filename !== content.body) {
+    if (hasCaption && content.filename && content.filename !== content.body) {
       if (captionPosition !== CaptionPosition.Inline)
         return (
           <MText