diff --git a/packages/rocketchat-ui/client/components/table.js b/packages/rocketchat-ui/client/components/table.js
index 63e4f284b83e7..9922e7202c5e8 100644
--- a/packages/rocketchat-ui/client/components/table.js
+++ b/packages/rocketchat-ui/client/components/table.js
@@ -4,25 +4,19 @@ Template.table.onRendered(function() {
 	const dummyTr = '<tr class="table-tr-dummy"></tr>';
 	this.$('tbody').prepend(dummyTr).append(dummyTr);
 
-	const onResize = this.data.onResize;
-	if (onResize) {
-		onResize();
-		$(window).on('resize', onResize);
+	this.onResize = this.data.onResize;
+	if (this.onResize) {
+		this.onResize();
+		$(window).on('resize', this.onResize);
 	}
 });
 
-Template.table.events({
-	'click tbody tr'(e, t) {
-		const onItemClick = t.data.onItemClick;
-
-		return onItemClick && onItemClick(this);
-	},
-	'scroll .table-scroll': _.debounce((e, t) => {
-		const onScroll = t.data.onScroll;
+Template.table.onDestroyed(function() {
+	$(window).on('off', this.onResize);
+});
 
-		return onScroll && onScroll(e.currentTarget);
-	}, 300),
-	'click .js-sort'(e, t) {
-		t.data.onSort(e.currentTarget.dataset.sort);
-	}
+Template.table.events({
+	'click tbody tr'(e, t) { t.data.onItemClick && t.data.onItemClick(this); },
+	'scroll .table-scroll': _.debounce((e, t) => t.data.onScroll && t.data.onScroll(e.currentTarget), 300),
+	'click .js-sort'(e, t) { t.data.onSort(e.currentTarget.dataset.sort); }
 });
diff --git a/packages/rocketchat-ui/client/views/app/directory.js b/packages/rocketchat-ui/client/views/app/directory.js
index 005c15e3b3afa..cc7937bea9ac2 100644
--- a/packages/rocketchat-ui/client/views/app/directory.js
+++ b/packages/rocketchat-ui/client/views/app/directory.js
@@ -107,7 +107,7 @@ Template.directory.helpers({
 	},
 	onTableScroll() {
 		const instance = Template.instance();
-		if (instance.loading || instance.end.get()) {
+		if (instance.isLoading.get() || instance.end.get()) {
 			return;
 		}
 		return function(currentTarget) {
@@ -182,10 +182,6 @@ Template.directory.onRendered(function() {
 	});
 });
 
-Template.directory.onDestroyed(function() {
-	$(window).on('off', this.resize);
-});
-
 Template.directory.onCreated(function() {
 	this.searchText = new ReactiveVar('');
 	this.searchType = new ReactiveVar('channels');