diff --git a/apps/demo/index.html b/apps/demo/index.html
index ee5ba6390..107b3533d 100644
--- a/apps/demo/index.html
+++ b/apps/demo/index.html
@@ -1,12 +1,39 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="theme-color" media="(prefers-color-scheme: light)" content="<%- themeColorLight %>">
-    <meta name="theme-color" media="(prefers-color-scheme: dark)" content="<%- themeColorDark %>">
+    <meta
+      name="theme-color"
+      media="(prefers-color-scheme: light)"
+      content="<%- themeColorLight %>"
+    />
+    <meta
+      name="theme-color"
+      media="(prefers-color-scheme: dark)"
+      content="<%- themeColorDark %>"
+    />
     <title><%- title %></title>
+    <script>
+      (function (l) {
+        if (l.search[1] === "/") {
+          var decoded = l.search
+            .slice(1)
+            .split("&")
+            .map(function (s) {
+              return s.replace(/~and~/g, "&");
+            })
+            .join("?");
+
+          window.history.replaceState(
+            null,
+            null,
+            l.pathname.slice(0, -1) + decoded + l.hash
+          );
+        }
+      })(window.location);
+    </script>
   </head>
   <body>
     <div id="root"></div>
diff --git a/apps/demo/public/404.html b/apps/demo/public/404.html
new file mode 100644
index 000000000..303460e93
--- /dev/null
+++ b/apps/demo/public/404.html
@@ -0,0 +1,33 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <title>Redirecting...</title>
+    <script>
+      var pathSegmentsToKeep = 1;
+      var l = window.location;
+
+      l.replace(
+        l.protocol +
+          "//" +
+          l.hostname +
+          (l.port ? ":" + l.port : "") +
+          l.pathname
+            .split("/")
+            .slice(0, 1 + pathSegmentsToKeep)
+            .join("/") +
+          "/?/" +
+          l.pathname
+            .slice(1)
+            .split("/")
+            .slice(pathSegmentsToKeep)
+            .join("/")
+            .replace(/&/g, "~and~") +
+          (l.search ? "&" + l.search.slice(1).replace(/&/g, "~and~") : "") +
+          l.hash
+      );
+    </script>
+  </head>
+
+  <body></body>
+</html>
