diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index ee32cde6b..46ae5757b 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -5116,8 +5116,8 @@ typedef enum : NSUInteger {
             }
         }
 
-        // MJK FIXME - investigate this more
-        if (viewItem.interaction.timestampForLegacySorting > collapseCutoffTimestamp) {
+        // Avoid animation churn by supressing footer-collapse on messages received recently.
+        if (viewItem.interaction.receivedAtTimestamp > collapseCutoffTimestamp) {
             shouldHideFooter = NO;
         }