diff --git a/client/components/Chat.vue b/client/components/Chat.vue
index 92e1860d..79940196 100644
--- a/client/components/Chat.vue
+++ b/client/components/Chat.vue
@@ -57,7 +57,7 @@
 						ref="chat"
 						class="chat"
 					>
-						<div class="show-more">
+						<div :class="['show-more', { show: channel.moreHistoryAvailable }]">
 							<button
 								ref="loadMoreButton"
 								:disabled="channel.historyLoading || !$root.connected"
diff --git a/client/css/style.css b/client/css/style.css
index ec8d7c1a..4dfc02e8 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -1080,6 +1080,7 @@ background on hover (unless active) */
 	padding-top: 15px;
 	padding-bottom: 0;
 	width: 100%;
+	display: none;
 }
 
 #chat .show-more .btn {
diff --git a/client/js/socket-events/more.js b/client/js/socket-events/more.js
index cbb8ba1e..6918610a 100644
--- a/client/js/socket-events/more.js
+++ b/client/js/socket-events/more.js
@@ -18,6 +18,7 @@ socket.on("more", function(data) {
 		return;
 	}
 
+	channel.channel.moreHistoryAvailable = data.moreHistoryAvailable;
 	channel.channel.messages.unshift(...data.messages);
 	channel.channel.historyLoading = false;
 
@@ -26,8 +27,4 @@ socket.on("more", function(data) {
 		const position = chan.height() - heightOld;
 		scrollable.finish().scrollTop(position);
 	});
-
-	if (data.messages.length !== 100) {
-		scrollable.find(".show-more").removeClass("show");
-	}
 });
diff --git a/src/client.js b/src/client.js
index f88be03b..678f11a8 100644
--- a/src/client.js
+++ b/src/client.js
@@ -400,6 +400,7 @@ Client.prototype.more = function(data) {
 	return {
 		chan: chan.id,
 		messages: messages,
+		moreHistoryAvailable: index > 100,
 	};
 };
 
diff --git a/src/models/chan.js b/src/models/chan.js
index 56d5adf0..74ce1895 100644
--- a/src/models/chan.js
+++ b/src/models/chan.js
@@ -178,12 +178,14 @@ Chan.prototype.getFilteredClone = function(lastActiveChannel, lastMessage) {
 				newChannel[prop] = this[prop]
 					.filter((m) => m.id > lastMessage)
 					.slice(-100);
+				newChannel.moreHistoryAvailable = this[prop].length > 100;
 			} else {
 				// If channel is active, send up to 100 last messages, for all others send just 1
 				// Client will automatically load more messages whenever needed based on last seen messages
-				const messagesToSend = lastActiveChannel === true || this.id === lastActiveChannel ? -100 : -1;
+				const messagesToSend = lastActiveChannel === true || this.id === lastActiveChannel ? 100 : 1;
 
-				newChannel[prop] = this[prop].slice(messagesToSend);
+				newChannel[prop] = this[prop].slice(-messagesToSend);
+				newChannel.moreHistoryAvailable = this[prop].length > messagesToSend;
 			}
 		} else {
 			newChannel[prop] = this[prop];