diff --git a/Signal/src/ViewControllers/ConversationView/ConversationMessageMapping.swift b/Signal/src/ViewControllers/ConversationView/ConversationMessageMapping.swift
index 302922b4d5..2832f604ef 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationMessageMapping.swift
+++ b/Signal/src/ViewControllers/ConversationView/ConversationMessageMapping.swift
@@ -54,7 +54,7 @@ public class ConversationMessageMapping: NSObject {
     }
 
     // After this size, we'll start unloading interactions
-    private let maxInteractionLimit: Int = 200
+    private let maxInteractionLimit: Int = 500
 
     // oldest saved message in a conversation has an index of 0, the most recent message has index conversationCount - 1.
     private var loadedIndexSet = IndexSet()
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 6594948cf1..eb69fa9a43 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -1761,7 +1761,7 @@ typedef enum : NSUInteger {
     }
     [self.navigationController.view layoutIfNeeded];
     CGSize navControllerSize = self.navigationController.view.frame.size;
-    CGFloat loadThreshold = MAX(navControllerSize.width, navControllerSize.height);
+    CGFloat loadThreshold = MAX(navControllerSize.width, navControllerSize.height) * 3;
 
     BOOL closeToTop = self.collectionView.contentOffset.y < loadThreshold;
     if (self.showLoadOlderHeader && closeToTop) {