diff --git a/ts/models/conversations.ts b/ts/models/conversations.ts
index 475665b47e..81b580ff12 100644
--- a/ts/models/conversations.ts
+++ b/ts/models/conversations.ts
@@ -1820,7 +1820,7 @@ export class ConversationModel extends window.Backbone
         let upgradedMessage = message;
         if ((schemaVersion || 0) < Message.VERSION_NEEDED_FOR_DISPLAY) {
           // Yep, we really do want to wait for each of these
-          upgradedMessage = await upgradeMessageSchema(message);
+          upgradedMessage = await upgradeMessageSchema(model.attributes);
           model.set(upgradedMessage);
           await DataWriter.saveMessage(upgradedMessage, { ourAci });
           upgraded += 1;