diff --git a/packages/rocketchat-ui-master/master/main.coffee b/packages/rocketchat-ui-master/master/main.coffee
index a14de7c6955..dffea890c07 100644
--- a/packages/rocketchat-ui-master/master/main.coffee
+++ b/packages/rocketchat-ui-master/master/main.coffee
@@ -150,7 +150,10 @@ Template.main.helpers
 		return RocketChat.iframeLogin.reactiveIframeUrl.get()
 
 	subsReady: ->
-		ready = not Meteor.userId()? or (FlowRouter.subsReady('userData', 'activeUsers') and CachedChatSubscription.ready.get())
+		routerReady = FlowRouter.subsReady('userData', 'activeUsers')
+		subscriptionsReady = CachedChatSubscription.ready.get()
+
+		ready = not Meteor.userId()? or (routerReady and subscriptionsReady)
 		RocketChat.CachedCollectionManager.syncEnabled = ready
 		return ready