diff --git a/index.html b/index.html
index f9d426d5..514579c8 100644
--- a/index.html
+++ b/index.html
@@ -22,11 +22,9 @@
   <script>
     const urlParams = new URLSearchParams(window.location.search);
     const p = urlParams.get('path');
-    const h = urlParams.get('hash')
 
     if (p) {
-      const redirectPath = h ? `${p}${h}` : p
-      history.replaceState(null, '', redirectPath);
+      history.replaceState(null, '', p + window.location.hash);
     }
   </script>
   <div id="app"></div>
diff --git a/public/404.html b/public/404.html
index 5ae96d9f..4cf419cf 100644
--- a/public/404.html
+++ b/public/404.html
@@ -7,7 +7,7 @@
     if (window.location.pathname !== '/index.html') {
       const hash = window.location.hash
       const pathname = window.location.pathname;
-      window.location.replace(`/index.html?path=${pathname}&hash=${hash}`);
+      window.location.replace(`/index.html?path=${encodeURIComponent(pathname)}${encodeURIComponent(hash)}`);
     }
   </script>
 </head>