diff --git a/docker/drawio/webapp/index.html b/docker/drawio/webapp/index.html
index 666d2bdd0..86b79d728 100644
--- a/docker/drawio/webapp/index.html
+++ b/docker/drawio/webapp/index.html
@@ -17,9 +17,10 @@
     <meta name="mobile-web-app-capable" content="yes">
 	<meta name="theme-color" content="#d89000">
 	<script type="text/javascript">
-        window.EXPORT_URL = window.location.origin + "/drawio/export/";
-        window.DRAWIO_LIGHTBOX_URL = window.location.origin + "/drawio/webapp";
-        setInterval(function() {window.ICONSEARCH_PATH = window.location.origin + "/drawio/iconsearch";}, 1000)
+        window.SERVER_HOME_URL = window.location.origin + "/"
+        window.EXPORT_URL = window.SERVER_HOME_URL + "drawio/export/";
+        window.DRAWIO_LIGHTBOX_URL = window.SERVER_HOME_URL + "drawio/webapp";
+        setInterval(function() {window.ICONSEARCH_PATH = window.SERVER_HOME_URL + "drawio/iconsearch";}, 1000)
 
         /**
 		 * URL Parameters and protocol description are here:
diff --git a/electron/drawio.js b/electron/drawio.js
index cf609c043..788a6f720 100644
--- a/electron/drawio.js
+++ b/electron/drawio.js
@@ -5,7 +5,9 @@ if (window.cacheServerUrl) {
     window.systemInfo.apiUrl = window.cacheServerUrl
 }
 
-window.EXPORT_URL = window.systemInfo.apiUrl + "../drawio/export/";
-window.DRAWIO_LIGHTBOX_URL = window.systemInfo.apiUrl + "../drawio/webapp";
-while (window.EXPORT_URL.indexOf("/../") !== -1) {window.EXPORT_URL = window.EXPORT_URL.replace(/\/(((?!\/).)*)\/\.\.\//, "/")}
-while (window.DRAWIO_LIGHTBOX_URL.indexOf("/../") !== -1) {window.DRAWIO_LIGHTBOX_URL = window.DRAWIO_LIGHTBOX_URL.replace(/\/(((?!\/).)*)\/\.\.\//, "/")}
+window.SERVER_HOME_URL = window.systemInfo.apiUrl + "../";
+while (window.SERVER_HOME_URL.indexOf("/../") !== -1) {window.SERVER_HOME_URL = window.SERVER_HOME_URL.replace(/\/(((?!\/).)*)\/\.\.\//, "/")}
+
+window.EXPORT_URL = window.SERVER_HOME_URL + "drawio/export/";
+window.DRAWIO_LIGHTBOX_URL = window.SERVER_HOME_URL + "drawio/webapp";
+setInterval(function() {window.ICONSEARCH_PATH = window.SERVER_HOME_URL + "drawio/iconsearch";}, 1000)