diff --git a/Session/Conversations/ConversationVC.swift b/Session/Conversations/ConversationVC.swift
index 0cd306316..134e4a3cf 100644
--- a/Session/Conversations/ConversationVC.swift
+++ b/Session/Conversations/ConversationVC.swift
@@ -334,10 +334,10 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat
                 case .insert:
                     // Perform inserts before updates
                     self.messagesTableView.insertRows(at: [ IndexPath(row: Int(update.newIndex), section: 0) ], with: .fade)
-                    shouldScrollToBottom = true
+                    shouldScrollToBottom = (self.scrollButton.alpha == 0)
                 case .update:
                     self.messagesTableView.reloadRows(at: [ IndexPath(row: Int(update.oldIndex), section: 0) ], with: .fade)
-                    shouldScrollToBottom = true
+                    shouldScrollToBottom = (self.scrollButton.alpha == 0)
                 default: preconditionFailure()
                 }
             }