diff --git a/Session/Conversations/ConversationViewModel.m b/Session/Conversations/ConversationViewModel.m
index 3c89aafe4..588711011 100644
--- a/Session/Conversations/ConversationViewModel.m
+++ b/Session/Conversations/ConversationViewModel.m
@@ -823,18 +823,13 @@ NS_ASSUME_NONNULL_BEGIN
             return [self.delegate conversationViewModelDidUpdate:ConversationUpdate.reloadUpdate];
         }
         
-        if (!viewItem.hasCachedLayoutState) {
-            [updatedItemSet addObject:itemId];
-            [updatedNeighborItemSet addObject:itemId];
+        if ([viewItem.interaction isKindOfClass:TSMessage.class]) {
+            TSMessage *message = (TSMessage *)viewItem.interaction;
+            if ([MessageInvalidator isInvalidated:message]) {
+                [updatedItemSet addObject:itemId];
+                [updatedNeighborItemSet addObject:itemId];
+            }
         }
-        
-//        if ([viewItem.interaction isKindOfClass:TSMessage.class]) {
-//            TSMessage *message = (TSMessage *)viewItem.interaction;
-//            if ([MessageInvalidator isInvalidated:message]) {
-//                [updatedItemSet addObject:itemId];
-//                [updatedNeighborItemSet addObject:itemId];
-//            }
-//        }
     }
 
     // 3. Updates.