diff --git a/src/components/messageStream/MessageBubble.tsx b/src/components/messageStream/MessageBubble.tsx
index 7c70f69..66d4105 100644
--- a/src/components/messageStream/MessageBubble.tsx
+++ b/src/components/messageStream/MessageBubble.tsx
@@ -9,7 +9,6 @@ import { VideoBubble } from "./bubbles/VideoBubble";
 import { LinkPreviewCard } from "./LinkPreviewCard";
 import { formatDateTime } from "./utils/formatTime";
 import { FavoriteButton } from "../../favorites/FavoriteButton";
-import { BubbleAttachmentDownloadButton } from "./BubbleAttachmentDownloadButton";
 
 export type MessageBubbleVariant = "default" | "latest";
 
@@ -107,12 +106,6 @@ export function MessageBubble({
                   onFavoriteChange?.(post.id, favorited)
                 }
               />
-              {isFileBubble && post.attachments[0] ? (
-                <BubbleAttachmentDownloadButton
-                  postId={post.id}
-                  attachment={post.attachments[0]}
-                />
-              ) : null}
             </div>
           </div>
         ) : null}
diff --git a/src/components/messageStream/bubbles/FileDocBubble.tsx b/src/components/messageStream/bubbles/FileDocBubble.tsx
index 5f44c70..bb97223 100644
--- a/src/components/messageStream/bubbles/FileDocBubble.tsx
+++ b/src/components/messageStream/bubbles/FileDocBubble.tsx
@@ -16,9 +16,10 @@ import {
 } from "../../SaveToAlbumGuide";
 import { useToast } from "../../Toast";
 import { FavoriteButton } from "../../../favorites/FavoriteButton";
+import { BubbleAttachmentDownloadButton } from "../BubbleAttachmentDownloadButton";
 import type { MessageBubbleVariant } from "../MessageBubble";
 
-function AttachmentRow({ att }: { postId: string; att: Attachment }) {
+function AttachmentRow({ postId, att }: { postId: string; att: Attachment }) {
   const { Icon, color } = fileIcon({ mime: att.mime, filename: att.filename });
   const displayFilename = filenameWithExtension(att.filename, att.mime);
   const [previewFailed, setPreviewFailed] = useState(false);
@@ -69,6 +70,7 @@ function AttachmentRow({ att }: { postId: string; att: Attachment }) {
           {formatBytes(att.sizeBytes)}
         </div>
       </div>
+      <BubbleAttachmentDownloadButton postId={postId} attachment={att} />
     </div>
   );
 }