diff --git a/Session/Conversations/ConversationViewModel.m b/Session/Conversations/ConversationViewModel.m
index b893fe7f5..2b8952cca 100644
--- a/Session/Conversations/ConversationViewModel.m
+++ b/Session/Conversations/ConversationViewModel.m
@@ -170,10 +170,10 @@ NS_ASSUME_NONNULL_BEGIN
 //
 // PERF: we could do less messages on shorter (older, slower) devices
 // PERF: we could cache the cell height, since some messages will be much taller.
-static const int kYapDatabasePageSize = 100;
+static const int kYapDatabasePageSize = 25000;
 
 // Never show more than n messages in conversation view when user arrives.
-static const int kConversationInitialMaxRangeSize = 100;
+static const int kConversationInitialMaxRangeSize = 25000;
 
 // Never show more than n messages in conversation view at a time.
 static const int kYapDatabaseRangeMaxLength = 25000;