diff --git a/Signal/src/ViewControllers/MediaGalleryViewController.swift b/Signal/src/ViewControllers/MediaGalleryViewController.swift
index ee0b587f4..9bffd3743 100644
--- a/Signal/src/ViewControllers/MediaGalleryViewController.swift
+++ b/Signal/src/ViewControllers/MediaGalleryViewController.swift
@@ -45,7 +45,7 @@ public class MediaGalleryItem: Equatable, Hashable {
     // MARK: Hashable
 
     public var hashValue: Int {
-        return attachmentStream.hashValue
+        return attachmentStream.uniqueId?.hashValue ?? attachmentStream.hashValue
     }
 }
 
diff --git a/SignalServiceKit/src/Messages/Interactions/TSInteraction.m b/SignalServiceKit/src/Messages/Interactions/TSInteraction.m
index ff05ac78a..37434f8ef 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSInteraction.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSInteraction.m
@@ -172,8 +172,8 @@ NSString *NSStringFromOWSInteractionType(OWSInteractionType value)
 }
 
 - (void)saveWithTransaction:(YapDatabaseReadWriteTransaction *)transaction {
-    OWSAssertDebug(self.uniqueId);
     if (!self.uniqueId) {
+        OWSFailDebug(self.uniqueId);
         self.uniqueId = [OWSPrimaryStorage getAndIncrementMessageIdWithTransaction:transaction];
     }