diff --git a/templates/pages/backoffice/ajaxpage/layout.html.twig b/templates/pages/backoffice/ajaxpage/layout.html.twig
index edd1f088da..66b6450b8e 100644
--- a/templates/pages/backoffice/ajaxpage/layout.html.twig
+++ b/templates/pages/backoffice/ajaxpage/layout.html.twig
@@ -27,33 +27,44 @@
 			<script type="text/javascript">
 				var aFilesToLoad{{ sId }} = [];
 				{% for sJsFile in aPage.aJsFiles %}
-					aFilesToLoad{{ sId }}.push('{{ sJsFile|raw }}');
+					if (! $.inArray('{{ sJsFile|raw }}',aListJsFiles))
+					{
+						aFilesToLoad{{ sId }}.push('{{ sJsFile|add_itop_version }}');
+						aListJsFiles.push("{{ sJsFile }}");
+					}
 				{% endfor %}
 				var iCurrentIdx{{ sId }} = 0;
 				var iFilesToLoadCount{{ sId }} = aFilesToLoad{{ sId }}.length;
-				var fLoadScript{{ sId }} = function(){
-					$.when(
-						$.ajax({
+				if(iFilesToLoadCount{{ sId }}>0)
+				{
+					var fLoadScript{{ sId }} = function () {
+						$.when(
+								$.ajax({
 									url: aFilesToLoad{{ sId }}[iCurrentIdx{{ sId }}],
 									dataType: 'script',
 									cache: true
 								})
-						)
-						.then(function(){
-							iCurrentIdx{{ sId }}++;
-							if (iCurrentIdx{{ sId }} !== iFilesToLoadCount{{ sId }})
-							{
-								fLoadScript{{ sId }}();
-							}
-							else
-							{
-								{% for sJsInlineOnDomReady in aPage.aJsInlineOnDomReady %}
-									{{ sJsInlineOnDomReady|raw }}
-								{% endfor %}
-							}
-						});
-				};
-				fLoadScript{{ sId }}();
+								)
+								.then(function () {
+									iCurrentIdx{{ sId }}++;
+									if (iCurrentIdx{{ sId }} !== iFilesToLoadCount{{ sId }})
+									{
+										fLoadScript{{ sId }}();
+									}
+									else
+									{
+										{% for sJsInlineOnDomReady in aPage.aJsInlineOnDomReady %}
+										{{ sJsInlineOnDomReady|raw }}
+										{% endfor %}
+									}
+								});
+					};
+					fLoadScript{{ sId }}();
+				} else {
+					{% for sJsInlineOnDomReady in aPage.aJsInlineOnDomReady %}
+					{{ sJsInlineOnDomReady|raw }}
+					{% endfor %}
+				}
 			</script>
 		{% endblock %}
 	{% else %}
diff --git a/templates/pages/backoffice/webpage/layout.html.twig b/templates/pages/backoffice/webpage/layout.html.twig
index ff2318882c..c8eb42bccd 100644
--- a/templates/pages/backoffice/webpage/layout.html.twig
+++ b/templates/pages/backoffice/webpage/layout.html.twig
@@ -54,7 +54,12 @@
         {{ render_block(oBlock, {aPage: aPage}) }}
     {% endfor %}
 {% endblock %}
-
+<script type="text/javascript">
+	var aListJsFiles = [];
+	{% for sJsFile in aPage.aJsFiles %}
+		aListJsFiles.push("{{ sJsFile}}");
+	{% endfor %}
+</script>
 {% block iboPageJsFiles %}
     {% for sJsFile in aPage.aJsFiles %}
         <script type="text/javascript" src="{{ sJsFile|add_itop_version }}"></script>