diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
index 264777c727..3999d02fb0 100644
--- a/ts/state/ducks/conversations.ts
+++ b/ts/state/ducks/conversations.ts
@@ -54,6 +54,7 @@ export type MessageType = {
   quote?: { author: string };
   received_at: number;
   hasSignalAccount?: boolean;
+  bodyPending?: boolean;
   attachments: Array<AttachmentType>;
   sticker: {
     data?: {
@@ -531,6 +532,12 @@ function hasMessageHeightChanged(
     return true;
   }
 
+  const longMessageAttachmentLoaded =
+    previous.bodyPending && !message.bodyPending;
+  if (longMessageAttachmentLoaded) {
+    return true;
+  }
+
   const firstAttachmentNoLongerPending =
     previousAttachments[0] &&
     previousAttachments[0].pending &&