diff --git a/src/platform/StackedRouter.tsx b/src/platform/StackedRouter.tsx
index f79da9a..c8f0417 100644
--- a/src/platform/StackedRouter.tsx
+++ b/src/platform/StackedRouter.tsx
@@ -578,7 +578,11 @@ const StackedRouter: Component<StackedRouterProps> = (oprops) => {
   createRenderEffect(() =>
     untrack(() => {
       if (stack.length === 0) {
-        pushFrame(window.location.pathname, {
+        const parts = [window.location.pathname] as string[]
+        if (window.location.search) {
+          parts.push("?", window.location.search)
+        }
+        pushFrame(parts.join(''), {
           replace: "all",
         });
       }