diff --git a/client/routes/router.js b/client/routes/router.js
index a125c9eae6c85..678cc0d681a5e 100644
--- a/client/routes/router.js
+++ b/client/routes/router.js
@@ -178,4 +178,3 @@ FlowRouter.notFound = {
 		BlazeLayout.render('pageNotFound');
 	},
 };
-
diff --git a/packages/rocketchat-ui-utils/client/lib/openRoom.js b/packages/rocketchat-ui-utils/client/lib/openRoom.js
index 4b44e721dc691..d1c2799ec65f8 100644
--- a/packages/rocketchat-ui-utils/client/lib/openRoom.js
+++ b/packages/rocketchat-ui-utils/client/lib/openRoom.js
@@ -1,11 +1,9 @@
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
-import { Blaze } from 'meteor/blaze';
-import { Template } from 'meteor/templating';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 import { Session } from 'meteor/session';
-import { RoomManager, fireGlobalEvent, readMessage, RoomHistoryManager } from '..';
+import { Layout, RoomManager, fireGlobalEvent, readMessage, RoomHistoryManager } from '..';
 import { ChatSubscription, Rooms } from 'meteor/rocketchat:models';
 import { settings } from 'meteor/rocketchat:settings';
 import { callbacks } from 'meteor/rocketchat:callbacks';
@@ -14,21 +12,6 @@ import _ from 'underscore';
 
 window.currentTracker = undefined;
 
-let loadingDom;
-function getDomOfLoading() {
-	if (loadingDom) {
-		return loadingDom;
-	}
-
-	loadingDom = document.createElement('div');
-	const contentAsFunc = (content) => () => content;
-
-	const template = Blaze._TemplateWith({ }, contentAsFunc(Template.loading));
-	Blaze.render(template, loadingDom);
-
-	return loadingDom;
-}
-
 function replaceCenterDomBy(dom) {
 	const mainNode = document.querySelector('.main-content');
 	if (mainNode) {
@@ -53,7 +36,7 @@ export const openRoom = function(type, name) {
 			}
 
 			if (RoomManager.open(type + name).ready() !== true) {
-				replaceCenterDomBy(getDomOfLoading());
+				BlazeLayout.render('main', { modal: Layout.isEmbedded(), center: 'loading' });
 				return;
 			}
 			if (window.currentTracker) {