diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt
index 2db62f5406..110705ab7d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt
@@ -2185,7 +2185,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
         } else if (it.isPaymentNotification) {
           SignalDatabase.payments.updateMessageWithPayment(it) as MmsMessageRecord
         } else {
-          it as MmsMessageRecord
+          it.withAttachments() as MmsMessageRecord
         }
       }
     }