diff --git a/packages/rocketchat-ui-master/client/main.js b/packages/rocketchat-ui-master/client/main.js
index ad47ade5c67a..2a2b9efe015d 100644
--- a/packages/rocketchat-ui-master/client/main.js
+++ b/packages/rocketchat-ui-master/client/main.js
@@ -129,7 +129,8 @@ Template.main.helpers({
 	subsReady() {
 		const routerReady = FlowRouter.subsReady('userData', 'activeUsers');
 		const subscriptionsReady = CachedChatSubscription.ready.get();
-		const ready = (Meteor.userId() == null) || (routerReady && subscriptionsReady);
+		const settingsReady = RocketChat.settings.cachedCollection.ready.get();
+		const ready = (Meteor.userId() == null) || (routerReady && subscriptionsReady && settingsReady);
 		RocketChat.CachedCollectionManager.syncEnabled = ready;
 		return ready;
 	},