diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/chat.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/chat.js
index e58494973..7915e12cc 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/chat.js
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/chat.js
@@ -334,9 +334,10 @@ var ChatBoxUI = Class.extend({
         var locked = false;
         var scroll = this.chatMessagesDiv.scrollTop();
         var maxScroll = this.chatMessagesDiv[0].scrollHeight - this.chatMessagesDiv.outerHeight();
+        var noScrollBars = maxScroll <= 0;
         var ratio = scroll / maxScroll;
         
-        if(msgClass === "warningMessage" || ratio >= 0.95)
+        if(msgClass === "warningMessage" || noScrollBars || maxScroll <= 30 || ratio >= 0.95)
             locked = true;
         
         if(this.pingRegex != null && this.pingRegex.test(message))