diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index d735a6a04..263d92ee1 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -2866,6 +2866,15 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
                 }
                 break;
             }
+            case YapDatabaseViewChangeDelete: {
+                // Discard cached view items after deletes.
+                YapCollectionKey *collectionKey = rowChange.collectionKey;
+                OWSAssert(collectionKey.key.length > 0);
+                if (collectionKey.key) {
+                    [self.viewItemMap removeObjectForKey:collectionKey.key];
+                }
+                break;
+            }
             default:
                 break;
         }