diff --git a/client/js/lounge.js b/client/js/lounge.js
index 4936d39e..50c13350 100644
--- a/client/js/lounge.js
+++ b/client/js/lounge.js
@@ -131,7 +131,11 @@ window.vueMounted = () => {
 
 			if (lastChannel.messages.length > 0) {
 				lastChannel.firstUnread = lastChannel.messages[lastChannel.messages.length - 1].id;
+			}
+
+			if (lastChannel.messages.length > 100) {
 				lastChannel.messages.splice(0, lastChannel.messages.length - 100);
+				lastChannel.moreHistoryAvailable = true;
 			}
 		}
 
diff --git a/client/js/socket-events/msg.js b/client/js/socket-events/msg.js
index cfbd4327..e7e8d291 100644
--- a/client/js/socket-events/msg.js
+++ b/client/js/socket-events/msg.js
@@ -75,8 +75,9 @@ socket.on("msg", function(data) {
 		}
 	}
 
-	if (messageLimit > 0) {
+	if (channel.messages.length > messageLimit) {
 		channel.messages.splice(0, channel.messages.length - messageLimit);
+		channel.moreHistoryAvailable = true;
 	}
 
 	if ((data.msg.type === "message" || data.msg.type === "action") && channel.type === "channel") {