diff --git a/wise-webapp/src/main/webapp/WEB-INF/views/mindmapEditor.jsp b/wise-webapp/src/main/webapp/WEB-INF/views/mindmapEditor.jsp
index dd0a179b..e667e1b3 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/views/mindmapEditor.jsp
+++ b/wise-webapp/src/main/webapp/WEB-INF/views/mindmapEditor.jsp
@@ -6,10 +6,13 @@
 <%--@elvariable id="editorTryMode" type="java.lang.String"--%>
 <%--@elvariable id="lockInfo" type="com.wisemapping.service.LockInfo"--%>
 
+<c:set var="baseUrl" value="${requestScope['site.baseurl']}" scope="request" />
+<c:set var="baseJsUrl" value="${requestScope['site.static.js.url']}" scope="request" />
+
 <!DOCTYPE html>
 <html lang="${fn:substring(locale,0,2)}">
 <head>
-    <base href="${requestScope['site.baseurl']}/static/webapp/" />
+    <base href="${baseUrl}/static/webapp/" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta charset="utf-8" />
 
@@ -43,9 +46,7 @@
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root" class="mindplot-div-container"></div>
     
-    <script type="text/javascript" src="${requestScope['site.static.js.url']}/webapp/vendors.bundle.js" crossorigin="anonymous" defer></script>
-    <script type="text/javascript" src="${requestScope['site.static.js.url']}/webapp/app.bundle.js" crossorigin="anonymous" defer></script>
-
+    <script type="text/javascript" src="${baseJsUrl}/webapp/vendors.bundle.js" crossorigin="anonymous" defer></script>
+    <script type="text/javascript" src="${baseJsUrl}/webapp/app.bundle.js" crossorigin="anonymous" defer></script>
 </body>
-
 </html>
diff --git a/wise-webapp/src/main/webapp/WEB-INF/views/mindmapViewonly.jsp b/wise-webapp/src/main/webapp/WEB-INF/views/mindmapViewonly.jsp
index 1eb92c43..88cb969a 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/views/mindmapViewonly.jsp
+++ b/wise-webapp/src/main/webapp/WEB-INF/views/mindmapViewonly.jsp
@@ -1,5 +1,7 @@
 <%@page pageEncoding="UTF-8" %>
 <%@include file="init.jsp" %>
+<c:set var="baseUrl" value="${requestScope['site.baseurl']}" scope="request" />
+<c:set var="baseJsUrl" value="${requestScope['site.static.js.url']}" scope="request" />
 
 <%--@elvariable id="mindmap" type="com.wisemapping.model.Mindmap"--%>
 
@@ -7,7 +9,7 @@
 
 <html lang="${fn:substring(locale,0,2)}">
 <head>
-    <base href="${requestScope['site.baseurl']}/static/mindplot/" />
+    <base href="${baseUrl}/static/mindplot/" />
     <meta name="viewport" content="initial-scale=1">
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
@@ -71,7 +73,7 @@
         <span class="title"><spring:message code="DESCRIPTION"/>:</span><span>${mindmap.title}</span>
     </div>
 
-    <script type="text/javascript" src="${requestScope['site.static.js.url']}/mindplot/loader.js" crossorigin="anonymous" defer></script>
+    <script type="text/javascript" src="${baseJsUrl}/mindplot/loader.js" crossorigin="anonymous" defer></script>
 
     <div id="floating-panel">
         <div id="zoom-button">
diff --git a/wise-webapp/src/main/webapp/WEB-INF/views/reactInclude.jsp b/wise-webapp/src/main/webapp/WEB-INF/views/reactInclude.jsp
index e637dc4b..ac1561df 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/views/reactInclude.jsp
+++ b/wise-webapp/src/main/webapp/WEB-INF/views/reactInclude.jsp
@@ -1,11 +1,13 @@
 <%@ page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %>
 <%@taglib uri="jakarta.tags.functions" prefix="fn" %>
 <%@taglib uri="jakarta.tags.core" prefix="c"%>
+<c:set var="baseUrl" value="${requestScope['site.baseurl']}" scope="request" />
+<c:set var="baseJsUrl" value="${requestScope['site.static.js.url']}" scope="request" />
 
 <!DOCTYPE html>
 <html lang="${fn:substring(locale,0,2)}">
 <head>
-    <base href="${requestScope['site.baseurl']}/static/webapp/" />
+    <base href="${baseUrl}/static/webapp/" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta charset="utf-8" />
 
@@ -48,8 +50,8 @@
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
 
-    <script type="text/javascript" src="${requestScope['site.static.js.url']}/webapp/vendors.bundle.js" crossorigin="anonymous" async></script>
-    <script type="text/javascript" src="${requestScope['site.static.js.url']}/webapp/app.bundle.js" crossorigin="anonymous" async></script>
+    <script type="text/javascript" src="${baseJsUrl}/webapp/vendors.bundle.js" crossorigin="anonymous" async></script>
+    <script type="text/javascript" src="${baseJsUrl}/webapp/app.bundle.js" crossorigin="anonymous" async></script>
 </body>
 
 </html>
