diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index 410ed1b4a..e4bbe5c1e 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -747,6 +747,10 @@
             this.addScrollDownButtonWithCount(unreadCount);
           }
         }, 1);
+      } else if (this.view.atBottom()) {
+        // If we already thought we were at the bottom, then ensure that's the case.
+        //   Attempting to account for unpredictable completion of message rendering.
+        setTimeout(() => this.view.scrollToBottom(), 1);
       }
     },