diff --git a/packages/rocketchat-theme/client/imports/base.less b/packages/rocketchat-theme/client/imports/base.less
index b1ed815f691..9e7c88f689c 100644
--- a/packages/rocketchat-theme/client/imports/base.less
+++ b/packages/rocketchat-theme/client/imports/base.less
@@ -4572,6 +4572,7 @@ body:not(.is-cordova) {
 .load-more {
 	position: relative;
 	padding: 1rem 0;
+	height: 10px;
 }
 
 .search-messages-list {
diff --git a/packages/rocketchat-ui/views/app/room.coffee b/packages/rocketchat-ui/views/app/room.coffee
index 8a9f59f4eb1..57f6c4d24da 100644
--- a/packages/rocketchat-ui/views/app/room.coffee
+++ b/packages/rocketchat-ui/views/app/room.coffee
@@ -314,9 +314,6 @@ Template.room.events
 				RoomHistoryManager.getMoreNext(@_id)
 	, 200
 
-	'click .load-more > button': ->
-		RoomHistoryManager.getMore(@_id)
-
 	'click .new-message': (e) ->
 		Template.instance().atBottom = true
 		Template.instance().find('.input-message').focus()
diff --git a/packages/rocketchat-ui/views/app/room.html b/packages/rocketchat-ui/views/app/room.html
index af611e282cd..5597d136e02 100644
--- a/packages/rocketchat-ui/views/app/room.html
+++ b/packages/rocketchat-ui/views/app/room.html
@@ -84,7 +84,9 @@
 							{{#if canPreview}}
 								{{#if hasMore}}
 									<li class="load-more">
-										{{> loading}}
+										{{#if isLoading}}
+											{{> loading}}
+										{{/if}}
 									</li>
 								{{else}}
 									<li class="start color-info-font-color">
@@ -97,7 +99,9 @@
 							{{/each}}
 							{{#if hasMoreNext}}
 								<li class="load-more">
-									{{> loading}}
+									{{#if isLoading}}
+										{{> loading}}
+									{{/if}}
 								</li>
 							{{/if}}
 						</ul>