diff --git a/404.html b/404.html
new file mode 100644
index 0000000..2cc22b3
--- /dev/null
+++ b/404.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>Page Not Found</title>
+    <script>
+      sessionStorage.redirect = location.href;
+    </script>
+    <meta http-equiv="refresh" content="0;URL='/'" />
+  </head>
+  <body></body>
+</html>
diff --git a/assets/index-wUtR20Os.js b/assets/main-rZ5dI4br.js
similarity index 100%
rename from assets/index-wUtR20Os.js
rename to assets/main-rZ5dI4br.js
diff --git a/assets/index-ueCe1Kkh.css b/assets/main-ueCe1Kkh.css
similarity index 100%
rename from assets/index-ueCe1Kkh.css
rename to assets/main-ueCe1Kkh.css
diff --git a/index.html b/index.html
index 1ca6807..b87575a 100644
--- a/index.html
+++ b/index.html
@@ -35,10 +35,19 @@
       crossorigin
     />
     <title>ArDrive Turbo App</title>
-    <script type="module" crossorigin src="/turbo-app/assets/index-wUtR20Os.js"></script>
-    <link rel="stylesheet" crossorigin href="/turbo-app/assets/index-ueCe1Kkh.css">
+    <script type="module" crossorigin src="/turbo-app/assets/main-rZ5dI4br.js"></script>
+    <link rel="stylesheet" crossorigin href="/turbo-app/assets/main-ueCe1Kkh.css">
   </head>
   <body>
     <div id="root"></div>
+    <script>
+      (() => {
+        const redirect = sessionStorage.redirect;
+        delete sessionStorage.redirect;
+        if (redirect && redirect !== location.href) {
+          history.replaceState(null, null, redirect);
+        }
+      })();
+    </script>
   </body>
 </html>
diff --git a/public/404.html b/public/404.html
new file mode 100644
index 0000000..2cc22b3
--- /dev/null
+++ b/public/404.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>Page Not Found</title>
+    <script>
+      sessionStorage.redirect = location.href;
+    </script>
+    <meta http-equiv="refresh" content="0;URL='/'" />
+  </head>
+  <body></body>
+</html>
