diff --git a/SignalServiceKit/src/Messages/Interactions/TSMessage.m b/SignalServiceKit/src/Messages/Interactions/TSMessage.m
index 2df353e27..558af4613 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSMessage.m
@@ -216,11 +216,6 @@ static const NSUInteger OWSMessageSchemaVersion = 4;
 // TODO: This method contains view-specific logic and probably belongs in NotificationsManager, not in SSK.
 - (NSString *)previewTextWithTransaction:(YapDatabaseReadTransaction *)transaction
 {    
-    NSString *_Nullable bodyDescription = nil;
-    if (self.body.length > 0) {
-        bodyDescription = self.body;
-    }
-    
     NSString *_Nullable attachmentDescription = nil;
     if ([self hasAttachments]) {
         NSString *attachmentId = self.attachmentIds[0];
@@ -247,6 +242,11 @@ static const NSUInteger OWSMessageSchemaVersion = 4;
         }
     }
 
+    NSString *_Nullable bodyDescription = nil;
+    if (self.body.length > 0) {
+        bodyDescription = self.body;
+    }
+
     if (attachmentDescription.length > 0 && bodyDescription.length > 0) {
         // Attachment with caption.
         if ([CurrentAppContext() isRTL]) {