diff --git a/Session/Conversations/ConversationVC.swift b/Session/Conversations/ConversationVC.swift
index 932e0e0c0b..4f8a69a17a 100644
--- a/Session/Conversations/ConversationVC.swift
+++ b/Session/Conversations/ConversationVC.swift
@@ -148,7 +148,6 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat
         Storage.read { transaction in
             unreadCount = self.thread.unreadMessageCount(transaction: transaction)
         }
-        // FIXME: This crashes when you have more unread messages than loaded view items (viewItems is initially capped to kConversationInitialMaxRangeSize)
         unreadViewItems = unreadCount != 0 ? [ConversationViewItem](viewItems[viewItems.endIndex - Int(unreadCount) ..< viewItems.endIndex]) : []
     }
     
diff --git a/Session/Conversations/ConversationViewModel.m b/Session/Conversations/ConversationViewModel.m
index d0ba8f3e77..cee8ff67ec 100644
--- a/Session/Conversations/ConversationViewModel.m
+++ b/Session/Conversations/ConversationViewModel.m
@@ -173,7 +173,7 @@ + (ConversationUpdate *)diffUpdateWithUpdateItems:(nullable NSArray<Conversation
 static const int kYapDatabasePageSize = 100;
 
 // Never show more than n messages in conversation view when user arrives.
-static const int kConversationInitialMaxRangeSize = 300;
+static const int kConversationInitialMaxRangeSize = 25000; // TODO: Does it cause issues to set this so high?
 
 // Never show more than n messages in conversation view at a time.
 static const int kYapDatabaseRangeMaxLength = 25000;