diff --git a/dev/bootstrap.js b/dev/bootstrap.js
index af0f1506c..07a27b2ac 100644
--- a/dev/bootstrap.js
+++ b/dev/bootstrap.js
@@ -44,9 +44,7 @@ export default (App) => {
 	window.__APP_BOOT = (fErrorCallback) => {
 		domReady(() => {
 			window.setTimeout(() => {
-				if (window.document.getElementById('rainloop-templates-id')) {
-					start();
-				} else if (window.rainloopTEMPLATES && window.rainloopTEMPLATES[0]) {
+				if (window.rainloopTEMPLATES && window.rainloopTEMPLATES[0]) {
 					window.document.getElementById('rl-templates').innerHTML = window.rainloopTEMPLATES[0];
 					start();
 				} else {
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
index eff73ca19..9593e0d87 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -1225,7 +1225,7 @@ class Actions
 
 /*
 required by Index.html and rl.js:
-NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground PluginsLink AuthAccountHash
+NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBackground PluginsLink AuthAccountHash
 */
 
 		$aResult = array(
@@ -1593,6 +1593,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins
 			($bAdmin ? $aResult['LanguageAdmin'] : $aResult['Language']).'/'.$sStaticCache.'/';
 
 		// $aResult['TemplatesLink'] = './?/Templates/0/'.($bAdmin ? 'Admin' : 'App').'/'.$sStaticCache.'/';
+		$aResult['TemplatesLink'] = './?/Templates/0/'.($bAdmin ? 'Admin' : 'App').'/'.$sStaticCache.'/';
 
 		$bAppJsDebug = !!$this->Config()->Get('labs', 'use_app_debug_js', false);