diff --git a/Session/Conversations/ConversationVC.swift b/Session/Conversations/ConversationVC.swift
index e41658545..c60ceb578 100644
--- a/Session/Conversations/ConversationVC.swift
+++ b/Session/Conversations/ConversationVC.swift
@@ -777,9 +777,8 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat
     
     func autoLoadMoreIfNeeded() {
         let isMainAppAndActive = CurrentAppContext().isMainAppAndActive
-        guard isMainAppAndActive && viewModel.canLoadMoreItems() && !isLoadingMore
+        guard isMainAppAndActive && didFinishInitialLayout && viewModel.canLoadMoreItems() && !isLoadingMore
             && messagesTableView.contentOffset.y < ConversationVC.loadMoreThreshold else { return }
-        print("Ryan: auto loading more")
         isLoadingMore = true
         viewModel.loadAnotherPageOfMessages()
     }