diff --git a/SignalMessaging/environment/migrations/OWS113MultiAttachmentMediaMessages.swift b/SignalMessaging/environment/migrations/OWS113MultiAttachmentMediaMessages.swift
index 666e999d4..68919222b 100644
--- a/SignalMessaging/environment/migrations/OWS113MultiAttachmentMediaMessages.swift
+++ b/SignalMessaging/environment/migrations/OWS113MultiAttachmentMediaMessages.swift
@@ -15,7 +15,9 @@ public class OWS113MultiAttachmentMediaMessages: OWSDatabaseMigration {
     // Increment a similar constant for each migration.
     @objc
     class func migrationId() -> String {
-        return "113"
+        // NOTE: that we use .1 since there was a bug in the logic to
+        //       set albumMessageId.
+        return "113.1"
     }
 
     override public func runUp(completion: @escaping OWSDatabaseMigrationCompletion) {
diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachment.m b/SignalServiceKit/src/Messages/Attachments/TSAttachment.m
index badbcdae8..edc60ded3 100644
--- a/SignalServiceKit/src/Messages/Attachments/TSAttachment.m
+++ b/SignalServiceKit/src/Messages/Attachments/TSAttachment.m
@@ -58,6 +58,7 @@ NSUInteger const TSAttachmentSchemaVersion = 4;
     _contentType = contentType;
     _sourceFilename = sourceFilename;
     _caption = caption;
+    _albumMessageId = albumMessageId;
 
     _attachmentSchemaVersion = TSAttachmentSchemaVersion;
 
@@ -126,6 +127,7 @@ NSUInteger const TSAttachmentSchemaVersion = 4;
     }
     _contentType = contentType;
     _caption = pointer.caption;
+    _albumMessageId = pointer.albumMessageId;
 
     _attachmentSchemaVersion = TSAttachmentSchemaVersion;