diff --git a/resources/template/index.ejs b/resources/template/index.ejs
index 6f18621ea..0144db9b3 100644
--- a/resources/template/index.ejs
+++ b/resources/template/index.ejs
@@ -2,6 +2,7 @@
 <html>
   <head>
     <base href="<%= appPrefix %>" />
+    <link href="favicon.ico" rel="icon">
     <style>
       .loadmask {
         position: fixed;
@@ -12,10 +13,6 @@
         transform: -moz-translate(-50%, -50%);
         transform: -ms-translate(-50%, -50%);
         z-index: 999;
-
-        /* Keeping this for future reference */
-        /* opacity: 0;
-        animation: heartBeat 2s ease-in-out infinite; */
       }
 
       .loadmask-hidden {
@@ -58,6 +55,12 @@
     <noscript>
       You need to enable JavaScript to run this app.
     </noscript>
+    <div id="loadmask" class="loadmask">
+      <img src="loading-placeholder.png" id="loadmask-image">
+      <span id="loading-text">
+        Loading, please wait…
+      </span>
+    </div>
     <script src="./gis-client-config.js"></script>
     <script>
       if (!window.clientConfig) {
@@ -67,7 +70,8 @@
     </script>
     <script>
       const regex = /\applicationId=(\d+)/;
-      const appId = location.search.match(regex)[1];
+      const appIdCand = location.search.match(regex);
+      let appId = appIdCand ? appIdCand[1] : null;
       let logoPath = './shogun_spinner.gif';
       if (appId) {
         logoPath = localStorage.getItem(`SHOGun_Logo_Path_${appId}`);
@@ -78,12 +82,7 @@
         loadingImageElement.src = logoPath;
       }
     </script>
-    <div id="loadmask" class="loadmask">
-      <img src="loading-placeholder.png" id="loadmask-image">
-      <span id="loading-text">
-        Loading, please wait…
-      </span>
-    </div>
+
     <div id="app" class="app"></div>
   </body>
 </html>
diff --git a/rspack.common.js b/rspack.common.js
index 9003adfd8..64bf0470a 100644
--- a/rspack.common.js
+++ b/rspack.common.js
@@ -90,7 +90,6 @@ module.exports = {
       templateParameters: {
         appPrefix: process.env.HTML_BASE_URL ?? ''
       },
-      favicon: path.join(__dirname, 'resources', 'public', 'favicon.ico'),
       meta: {
         charset: 'utf-8',
         viewport: 'user-scalable=no, width=device-width, initial-scale=1, shrink-to-fit=no'
