diff --git a/src/pages/chat.js b/src/pages/chat.js
index a206645..7791f49 100644
--- a/src/pages/chat.js
+++ b/src/pages/chat.js
@@ -151,11 +151,12 @@ export default class Chat extends React.Component {
       this.connect(this.props.globalData.userId)
     }
 
-    if (
-      countAllMessages(prevState.msgs) !== countAllMessages(this.state.msgs) ||
-      prevState.selectedUser !== this.state.selectedUser
-    ) {
-      this.scrollToChatBottom()
+    if (prevState.selectedUser) {
+      const prevLatest = prevState.msgs[prevState.selectedUser].lastMessage
+      const newLatest = this.state.msgs[this.state.selectedUser].lastMessage
+      if (prevLatest.date !== newLatest.date) {
+        this.scrollToChatBottom()
+      }
     }
   }