diff --git a/app/assets/javascripts/src/views/chatView.js.erb b/app/assets/javascripts/src/views/chatView.js.erb
index d7fb63dd..d2a7cc36 100644
--- a/app/assets/javascripts/src/views/chatView.js.erb
+++ b/app/assets/javascripts/src/views/chatView.js.erb
@@ -260,12 +260,8 @@ Metamaps.Views.chatView = (function () {
     chatView.prototype.scrollMessages = function(duration) {
         duration = duration || 0;
 
-        var
-          numMessages = this.$messages.find('.chat-message').length,
-          messageHeight = 52;
-
         this.$messages.animate({
-            scrollTop: numMessages * messageHeight
+            scrollTop: this.$messages[0].scrollHeight
         }, duration);
     }