diff --git a/js/views/message_list_view.js b/js/views/message_list_view.js
index 86006336d..89d77f2f4 100644
--- a/js/views/message_list_view.js
+++ b/js/views/message_list_view.js
@@ -32,6 +32,9 @@
             this.scrollToBottom();
         },
         measureScrollPosition: function() {
+            if (this.el.scrollHeight === 0) { // hidden
+                return;
+            }
             this.scrollPosition = this.$el.scrollTop() + this.$el.outerHeight();
             this.scrollHeight = this.el.scrollHeight;
             this.shouldStickToBottom = this.scrollPosition === this.scrollHeight;