diff --git a/packages/docs/src/components/router-head/router-head.tsx b/packages/docs/src/components/router-head/router-head.tsx
index 67f51ef7173..5ab6de96fa8 100644
--- a/packages/docs/src/components/router-head/router-head.tsx
+++ b/packages/docs/src/components/router-head/router-head.tsx
@@ -1,12 +1,14 @@
-import { component$ } from '@qwik.dev/core';
-import { useDocumentHead, useLocation } from '@qwik.dev/router';
+import { component$, untrack } from '@qwik.dev/core';
+import { DocumentHeadTags, useDocumentHead, useLocation } from '@qwik.dev/router';
 import { Social } from './social';
-import { InjectThemeScript } from '../theme-toggle';
 import { Vendor } from './vendor';
 
+/** The dynamic head content */
 export const RouterHead = component$(() => {
-  const { url } = useLocation();
   const head = useDocumentHead();
+  const { url } = useLocation();
+  const href = head.frontmatter?.canonical || untrack(() => url.href);
+
   const title = head.title
     ? `${head.title} 📚 Qwik Documentation`
     : `Qwik - Framework reimagined for the edge`;
@@ -47,45 +49,23 @@ export const RouterHead = component$(() => {
       }
     },
   };
-
   return (
     <>
-      <title>{title}</title>
       <meta name="description" content={description} />
-      <link rel="canonical" href={head.frontmatter?.canonical || url.href} />
-      <meta name="viewport" content="width=device-width, initial-scale=1" />
-      <meta name="apple-mobile-web-app-title" content="Qwik" />
-      <meta name="application-name" content="Qwik" />
-      <meta name="apple-mobile-web-app-title" content="Qwik" />
-      <meta name="theme-color" content="#006ce9" />
-      <meta name="color-scheme" content="dark light" />
-
-      <link rel="apple-touch-icon" sizes="180x180" href="/favicons/apple-touch-icon.png" />
-      <link rel="icon" href="/favicons/favicon.svg" type="image/svg+xml" />
+      <link rel="canonical" href={href} />
 
       {import.meta.env.PROD && (
         <>
-          <Social title={title} description={description} href={url.href} ogImage={OGImage.URL} />
+          <Social title={title} description={description} href={href} ogImage={OGImage.URL} />
           <Vendor />
         </>
       )}
 
-      {head.meta
+      <DocumentHeadTags
+        title={title}
         // Skip description because that was already added at the top
-        .filter((s) => s.name !== 'description')
-        .map((m, key) => (
-          <meta key={key} {...m} />
-        ))}
-
-      {head.links.map((l, key) => (
-        <link key={key} {...l} />
-      ))}
-
-      {head.styles.map((s, key) => (
-        <style key={key} {...s.props} dangerouslySetInnerHTML={s.style} />
-      ))}
-
-      <InjectThemeScript />
+        meta={head.meta.filter((s) => s.name !== 'description')}
+      />
     </>
   );
 });
diff --git a/packages/docs/src/repl/ui/repl-commands.tsx b/packages/docs/src/repl/ui/repl-commands.tsx
index 5cde8113056..6d18aaa7072 100644
--- a/packages/docs/src/repl/ui/repl-commands.tsx
+++ b/packages/docs/src/repl/ui/repl-commands.tsx
@@ -1,11 +1,7 @@
 import { createPlaygroundShareUrl } from './repl-share-url';
 import type { ReplAppInput } from '../types';
 
-export const ReplCommands = ({
-  input,
-  enableCopyToPlayground,
-  enableDownload,
-}: ReplCommandProps) => {
+export const ReplCommands = ({ input, enableCopyToPlayground }: ReplCommandProps) => {
   return (
     <div class="repl-commands">
       {enableCopyToPlayground ? (
diff --git a/packages/docs/src/root.tsx b/packages/docs/src/root.tsx
index cd89a8393f4..c3968b4af42 100644
--- a/packages/docs/src/root.tsx
+++ b/packages/docs/src/root.tsx
@@ -1,18 +1,10 @@
 import { component$, useContextProvider, useStore } from '@qwik.dev/core';
 import { Insights } from '@qwik.dev/core/insights';
-import {
-  RouterOutlet,
-  ServiceWorkerRegister,
-  useDocumentHead,
-  useLocation,
-  useQwikRouter,
-} from '@qwik.dev/router';
-import RealMetricsOptimization from './components/real-metrics-optimization/real-metrics-optimization';
-import { Social } from './components/router-head/social';
-import { Vendor } from './components/router-head/vendor';
+import { RouterOutlet, useQwikRouter } from '@qwik.dev/router';
+import { RouterHead } from './components/router-head/router-head';
 import { InjectThemeScript } from './components/theme-toggle';
-import { BUILDER_PUBLIC_API_KEY } from './constants';
 import { GlobalStore, type SiteStore } from './context';
+
 import './global.css';
 
 export const uwu = /*javascript*/ `
@@ -50,8 +42,6 @@ export const uwu = /*javascript*/ `
 
 export default component$(() => {
   useQwikRouter();
-  const head = useDocumentHead();
-  const { url } = useLocation();
 
   const store = useStore<SiteStore>({
     headerMenuOpen: false,
@@ -62,55 +52,11 @@ export default component$(() => {
 
   useContextProvider(GlobalStore, store);
 
-  const title = head.title
-    ? `${head.title} 📚 Qwik Documentation`
-    : `Qwik - Framework reimagined for the edge`;
-  const description =
-    head.meta.find((m) => m.name === 'description')?.content ||
-    `No hydration, auto lazy-loading, edge-optimized, and fun 🎉!`;
-
-  const OGImage = {
-    imageURL: '',
-    ogImgTitle: '',
-    ogImgSubTitle: '' as string | undefined,
-
-    get URL() {
-      //turn the title into array with [0] -> Title [1] -> subTitle
-      const arrayedTitle = title.split(' | ');
-      const ogImageUrl = new URL('https://opengraphqwik.vercel.app/api/og?level=1');
-
-      // biggerTitle
-      this.ogImgTitle = arrayedTitle[0];
-      //smallerTitle
-      this.ogImgSubTitle = arrayedTitle[1]
-        ? arrayedTitle[1].replace(' 📚 Qwik Documentation', '')
-        : undefined;
-
-      //decide whether or not to show dynamic OGimage or use docs default social card
-      if (this.ogImgSubTitle == undefined || this.ogImgTitle == undefined) {
-        this.imageURL = new URL(`/logos/social-card.jpg`, url).href;
-
-        return this.imageURL;
-      } else {
-        ogImageUrl.searchParams.set('title', this.ogImgTitle);
-        ogImageUrl.searchParams.set('subtitle', this.ogImgSubTitle);
-        // ogImageUrl.searchParams.set('level', this.routeLevel.toString());
-
-        this.imageURL = ogImageUrl.toString();
-
-        return this.imageURL;
-      }
-    },
-  };
-
   return (
     <>
       <head>
         <meta charset="utf-8" />
 
-        <title>{title}</title>
-        <meta name="description" content={description} />
-        <link rel="canonical" href={head.frontmatter?.canonical || url.href} />
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="apple-mobile-web-app-title" content="Qwik" />
         <meta name="application-name" content="Qwik" />
@@ -121,38 +67,11 @@ export default component$(() => {
         <link rel="apple-touch-icon" sizes="180x180" href="/favicons/apple-touch-icon.png" />
         <link rel="icon" href="/favicons/favicon.svg" type="image/svg+xml" />
 
-        {import.meta.env.PROD && (
-          <>
-            <Social title={title} description={description} href={url.href} ogImage={OGImage.URL} />
-            <Vendor />
-          </>
-        )}
-
-        {/* The below are tags that were collected from all the `head` exports in the current route. */}
-        {head.meta
-          // Skip description because that was already added at the top
-          .filter((s) => s.name !== 'description')
-          .map((m, key) => (
-            <meta key={key} {...m} />
-          ))}
-
-        {head.links.map((l, key) => (
-          <link key={key} {...l} />
-        ))}
-
-        {head.styles.map((s, key) => (
-          <style key={key} {...s.props} dangerouslySetInnerHTML={s.style} />
-        ))}
-
-        {head.scripts.map((s, key) => (
-          <script key={key} {...s.props} dangerouslySetInnerHTML={s.script} />
-        ))}
+        <RouterHead />
 
         <InjectThemeScript />
         <script dangerouslySetInnerHTML={uwu} />
 
-        <ServiceWorkerRegister />
-
         <script dangerouslySetInnerHTML={`(${collectSymbols})()`} />
         <Insights />
       </head>
@@ -164,7 +83,6 @@ export default component$(() => {
       >
         {/* This renders the current route, including all Layout components. */}
         <RouterOutlet />
-        <RealMetricsOptimization builderApiKey={BUILDER_PUBLIC_API_KEY} />
       </body>
     </>
   );
diff --git a/packages/docs/src/routes/api/qwik-router/api.json b/packages/docs/src/routes/api/qwik-router/api.json
index 659c327c524..e8bd693130e 100644
--- a/packages/docs/src/routes/api/qwik-router/api.json
+++ b/packages/docs/src/routes/api/qwik-router/api.json
@@ -726,7 +726,7 @@
         }
       ],
       "kind": "Variable",
-      "content": "This is a wrapper around the `useQwikRouter()` hook. We recommend using the hook instead of this component.\n\n\n```typescript\nQwikRouterProvider: import(\"@qwik.dev/core\").Component<QwikRouterProps>\n```",
+      "content": "This is a wrapper around the `useQwikRouter()` hook. We recommend using the hook instead of this component, unless you have a good reason to make your root component reactive.\n\n\n```typescript\nQwikRouterProvider: import(\"@qwik.dev/core\").Component<QwikRouterProps>\n```",
       "editUrl": "https://github.com/QwikDev/qwik/tree/main/packages/qwik-router/src/runtime/src/qwik-router-component.tsx",
       "mdFile": "router.qwikrouterprovider.md"
     },
diff --git a/packages/docs/src/routes/api/qwik-router/index.mdx b/packages/docs/src/routes/api/qwik-router/index.mdx
index 8301a0c13ee..0e8487358a1 100644
--- a/packages/docs/src/routes/api/qwik-router/index.mdx
+++ b/packages/docs/src/routes/api/qwik-router/index.mdx
@@ -1796,7 +1796,7 @@ Default: `true`
 
 ## QwikRouterProvider
 
-This is a wrapper around the `useQwikRouter()` hook. We recommend using the hook instead of this component.
+This is a wrapper around the `useQwikRouter()` hook. We recommend using the hook instead of this component, unless you have a good reason to make your root component reactive.
 
 ```typescript
 QwikRouterProvider: import("@qwik.dev/core").Component<QwikRouterProps>;
diff --git a/packages/docs/src/routes/docs/(qwikrouter)/api/index.mdx b/packages/docs/src/routes/docs/(qwikrouter)/api/index.mdx
index 71cca539399..cffb498e143 100644
--- a/packages/docs/src/routes/docs/(qwikrouter)/api/index.mdx
+++ b/packages/docs/src/routes/docs/(qwikrouter)/api/index.mdx
@@ -356,11 +356,26 @@ export default component$(() => {
 });
 ```
 
-> `useQwikRouter()` should only be called once, in the root of your application.
+> `useQwikRouter()` should only be called once, in the root of your application. If your root component is reactive, you should move the reactive part into a child component, or you can use the `<QwikRouterProvider>` component instead.
 
 ## `<QwikRouterProvider>`
 
-The `QwikRouterProvider` component is a wrapper around the `useQwikRouter()` hook. It does not render any DOM element, not even the matched route. We recommend using the hook instead of this component.
+The `QwikRouterProvider` component is a wrapper around the `useQwikRouter()` hook. It does not render any DOM element, not even the matched route. We recommend using the hook instead of this component, except when your root component is reactive.
+
+```tsx title="src/root.tsx"
+import { QwikRouterProvider, RouterOutlet } from '@qwik.dev/router';
+
+export default component$(() => (
+  <QwikRouterProvider>
+    <head>
+      {/* ... */}
+    </head>
+    <body>
+      <RouterOutlet />
+    </body>
+  </QwikRouterProvider>
+));
+```
 
 ## `<QwikRouterMockProvider>`
 
diff --git a/packages/qwik-router/src/runtime/src/contexts.ts b/packages/qwik-router/src/runtime/src/contexts.ts
index 5f16b512ea8..007d36b6666 100644
--- a/packages/qwik-router/src/runtime/src/contexts.ts
+++ b/packages/qwik-router/src/runtime/src/contexts.ts
@@ -7,7 +7,6 @@ import type {
   RouteLocation,
   RouteNavigate,
   RoutePreventNavigate,
-  RouteStateInternal,
 } from './types';
 
 export const RouteStateContext =
@@ -25,8 +24,5 @@ export const RouteNavigateContext = /*#__PURE__*/ createContextId<RouteNavigate>
 
 export const RouteActionContext = /*#__PURE__*/ createContextId<RouteAction>('qc-a');
 
-export const RouteInternalContext =
-  /*#__PURE__*/ createContextId<Signal<RouteStateInternal>>('qc-ir');
-
 export const RoutePreventNavigateContext =
   /*#__PURE__*/ createContextId<RoutePreventNavigate>('qc-p');
diff --git a/packages/qwik-router/src/runtime/src/qwik-router-component.tsx b/packages/qwik-router/src/runtime/src/qwik-router-component.tsx
index ba17aeb4d41..4c4a72bcfad 100644
--- a/packages/qwik-router/src/runtime/src/qwik-router-component.tsx
+++ b/packages/qwik-router/src/runtime/src/qwik-router-component.tsx
@@ -36,7 +36,6 @@ import {
   ContentInternalContext,
   DocumentHeadContext,
   RouteActionContext,
-  RouteInternalContext,
   RouteLocationContext,
   RouteNavigateContext,
   RoutePreventNavigateContext,
@@ -76,6 +75,8 @@ import { createLoaderSignal, isSameOrigin, isSamePath, toUrl } from './utils';
 import { startViewTransition } from './view-transition';
 import transitionCss from './qwik-view-transition.css?inline';
 
+declare const window: ClientSPAWindow;
+
 /**
  * @deprecated Use `QWIK_ROUTER_SCROLLER` instead (will be removed in V3)
  * @public
@@ -122,6 +123,11 @@ const internalState = { navCount: 0 };
  * This hook should be used once, at the root of your application.
  */
 export const useQwikRouter = (props?: QwikRouterProps) => {
+  if (!isServer) {
+    throw new Error(
+      'useQwikRouter can only run during SSR on the server. If you are seeing this, it means you are re-rendering the root of your application. Fix that or use the <QwikRouterProvider> component around the root of your application.'
+    );
+  }
   useStyles$(transitionCss);
   const env = useQwikRouterEnv();
   if (!env?.params) {
@@ -136,15 +142,13 @@ export const useQwikRouter = (props?: QwikRouterProps) => {
   }
   const serverHead = useServerData<DocumentHeadValue>('documentHead');
 
-  if (isServer) {
-    if (
-      env!.ev.originalUrl.pathname !== env!.ev.url.pathname &&
-      !__EXPERIMENTAL__.enableRequestRewrite
-    ) {
-      throw new Error(
-        `enableRequestRewrite is an experimental feature and is not enabled. Please enable the feature flag by adding \`experimental: ["enableRequestRewrite"]\` to your qwikVite plugin options.`
-      );
-    }
+  if (
+    env.ev.originalUrl.pathname !== env.ev.url.pathname &&
+    !__EXPERIMENTAL__.enableRequestRewrite
+  ) {
+    throw new Error(
+      `enableRequestRewrite is an experimental feature and is not enabled. Please enable the feature flag by adding \`experimental: ["enableRequestRewrite"]\` to your qwikVite plugin options.`
+    );
   }
 
   const url = new URL(urlEnv);
@@ -193,11 +197,13 @@ export const useQwikRouter = (props?: QwikRouterProps) => {
     return loadersSerializationObject;
   };
 
+  // The initial state of routeInternal uses the URL provided by the server environment.
+  // It may not be accurate to the actual URL the browser is accessing the site from.
+  // It is useful for the purposes of SSR and SSG, but may be overridden browser-side
+  // if needed for SPA routing.
   const routeInternal = useSignal<RouteStateInternal>({
     type: 'initial',
     dest: url,
-    forceReload: false,
-    replaceState: false,
     scroll: true,
   });
   const documentHead = useStore<Editable<ResolvedDocumentHead>>(() =>
@@ -250,8 +256,7 @@ export const useQwikRouter = (props?: QwikRouterProps) => {
     (preventNav.$cbs$ ||= new Set()).add(fn$);
     // we need the QRLs to be synchronous if possible, for the beforeunload event
     fn$.resolve();
-    // TS thinks we're a webworker and doesn't know about beforeunload
-    (window as any).addEventListener('beforeunload', preventNav.$handler$);
+    window.addEventListener('beforeunload', preventNav.$handler$);
 
     return () => {
       if (preventNav.$cbs$) {
@@ -259,7 +264,7 @@ export const useQwikRouter = (props?: QwikRouterProps) => {
         if (!preventNav.$cbs$.size) {
           preventNav.$cbs$ = undefined;
           // unregister the event listener if no more callbacks, to make older Firefox happy
-          (window as any).removeEventListener('beforeunload', preventNav.$handler$);
+          window.removeEventListener('beforeunload', preventNav.$handler$!);
         }
       }
     };
@@ -274,6 +279,16 @@ export const useQwikRouter = (props?: QwikRouterProps) => {
     } = typeof opt === 'object' ? opt : { forceReload: opt };
     internalState.navCount++;
 
+    // If this is the first SPA navigation, we rewrite routeInternal's URL
+    // as the browser location URL to prevent an erroneous origin mismatch.
+    // The initial value of routeInternal is derived from the server env,
+    // which in the case of SSG may not match the actual origin the site
+    // is deployed on.
+    // We only do this for link navigations, as popstate will have already changed the URL
+    if (isBrowser && type === 'link' && routeInternal.value.type === 'initial') {
+      routeInternal.value.dest = new URL(window.location.href);
+    }
+
     const lastDest = routeInternal.value.dest;
     const dest =
       path === undefined
@@ -340,7 +355,7 @@ export const useQwikRouter = (props?: QwikRouterProps) => {
         restoreScroll(type, dest, new URL(location.href), scroller, getScrollHistory());
 
         if (type === 'popstate') {
-          (window as ClientSPAWindow)._qRouterScrollEnabled = true;
+          window._qRouterScrollEnabled = true;
         }
       }
 
@@ -351,7 +366,13 @@ export const useQwikRouter = (props?: QwikRouterProps) => {
       return;
     }
 
-    routeInternal.value = { type, dest, forceReload, replaceState, scroll };
+    routeInternal.value = {
+      type,
+      dest,
+      forceReload,
+      replaceState,
+      scroll,
+    };
 
     if (isBrowser) {
       loadClientData(dest, _getContextElement());
@@ -378,12 +399,12 @@ export const useQwikRouter = (props?: QwikRouterProps) => {
   useContextProvider(RouteNavigateContext, goto);
   useContextProvider(RouteStateContext, loaderState);
   useContextProvider(RouteActionContext, actionState);
-  useContextProvider(RouteInternalContext, routeInternal);
   useContextProvider<any>(RoutePreventNavigateContext, registerPreventNav);
 
   useTask$(({ track }) => {
     async function run() {
-      const [navigation, action] = track(() => [routeInternal.value, actionState.value]);
+      const navigation = track(routeInternal);
+      const action = track(actionState);
 
       const locale = getLocale('');
       const prevUrl = routeLocation.url;
@@ -551,32 +572,32 @@ export const useQwikRouter = (props?: QwikRouterProps) => {
           }
           CLIENT_DATA_CACHE.clear();
 
-          const win = window as ClientSPAWindow;
-          if (!win._qRouterSPA) {
+          // See also spa-init.ts
+          if (!window._qRouterSPA) {
             // only add event listener once
-            win._qRouterSPA = true;
+            window._qRouterSPA = true;
             history.scrollRestoration = 'manual';
 
-            win.addEventListener('popstate', () => {
+            window.addEventListener('popstate', () => {
               // Disable scroll handler eagerly to prevent overwriting history.state.
-              win._qRouterScrollEnabled = false;
-              clearTimeout(win._qRouterScrollDebounce);
+              window._qRouterScrollEnabled = false;
+              clearTimeout(window._qRouterScrollDebounce);
 
               goto(location.href, {
                 type: 'popstate',
               });
             });
 
-            win.removeEventListener('popstate', win._qRouterInitPopstate!);
-            win._qRouterInitPopstate = undefined;
+            window.removeEventListener('popstate', window._qRouterInitPopstate!);
+            window._qRouterInitPopstate = undefined;
 
             // Browsers natively will remember scroll on ALL history entries, incl. custom pushState.
             // Devs could push their own states that we can't control.
             // If a user doesn't initiate scroll after, it will not have any scrollState.
             // We patch these to always include scrollState.
             // TODO Block this after Navigation API PR, browsers that support it have a Navigation API solution.
-            if (!win._qRouterHistoryPatch) {
-              win._qRouterHistoryPatch = true;
+            if (!window._qRouterHistoryPatch) {
+              window._qRouterHistoryPatch = true;
               const pushState = history.pushState;
               const replaceState = history.replaceState;
 
@@ -616,7 +637,7 @@ export const useQwikRouter = (props?: QwikRouterProps) => {
             // Firefox only does it once and no more, but will still scroll. It also sets state to null.
             // Any <a> tags w/ #hash href will break SPA state in Firefox.
             // We patch these events and direct them to Link pipeline during SPA.
-            document.body.addEventListener('click', (event) => {
+            document.addEventListener('click', (event) => {
               if (event.defaultPrevented) {
                 return;
               }
@@ -638,8 +659,8 @@ export const useQwikRouter = (props?: QwikRouterProps) => {
                       history.pushState(null, '', dest);
                     }
 
-                    win._qRouterScrollEnabled = false;
-                    clearTimeout(win._qRouterScrollDebounce);
+                    window._qRouterScrollEnabled = false;
+                    clearTimeout(window._qRouterScrollDebounce);
                     saveScrollHistory({
                       ...currentScrollState(scroller),
                       x: 0,
@@ -654,8 +675,8 @@ export const useQwikRouter = (props?: QwikRouterProps) => {
               }
             });
 
-            document.body.removeEventListener('click', win._qRouterInitAnchors!);
-            win._qRouterInitAnchors = undefined;
+            document.removeEventListener('click', window._qRouterInitAnchors!);
+            window._qRouterInitAnchors = undefined;
 
             // TODO Remove block after Navigation API PR.
             // Calling `history.replaceState` during `visibilitychange` in Chromium will nuke BFCache.
@@ -666,10 +687,10 @@ export const useQwikRouter = (props?: QwikRouterProps) => {
                 'visibilitychange',
                 () => {
                   if (
-                    (win._qRouterScrollEnabled || win._qCityScrollEnabled) &&
+                    (window._qRouterScrollEnabled || window._qCityScrollEnabled) &&
                     document.visibilityState === 'hidden'
                   ) {
-                    if (win._qCityScrollEnabled) {
+                    if (window._qCityScrollEnabled) {
                       console.warn(
                         '"_qCityScrollEnabled" is deprecated. Use "_qRouterScrollEnabled" instead.'
                       );
@@ -683,39 +704,39 @@ export const useQwikRouter = (props?: QwikRouterProps) => {
                 { passive: true }
               );
 
-              document.removeEventListener('visibilitychange', win._qRouterInitVisibility!);
-              win._qRouterInitVisibility = undefined;
+              document.removeEventListener('visibilitychange', window._qRouterInitVisibility!);
+              window._qRouterInitVisibility = undefined;
             }
 
-            win.addEventListener(
+            window.addEventListener(
               'scroll',
               () => {
                 // TODO: remove "_qCityScrollEnabled" condition in v3
-                if (!win._qRouterScrollEnabled && !win._qCityScrollEnabled) {
+                if (!window._qRouterScrollEnabled && !window._qCityScrollEnabled) {
                   return;
                 }
 
-                clearTimeout(win._qRouterScrollDebounce);
-                win._qRouterScrollDebounce = setTimeout(() => {
+                clearTimeout(window._qRouterScrollDebounce);
+                window._qRouterScrollDebounce = setTimeout(() => {
                   const scrollState = currentScrollState(scroller);
                   saveScrollHistory(scrollState);
                   // Needed for e2e debounceDetector.
-                  win._qRouterScrollDebounce = undefined;
+                  window._qRouterScrollDebounce = undefined;
                 }, 200);
               },
               { passive: true }
             );
 
-            removeEventListener('scroll', win._qRouterInitScroll!);
-            win._qRouterInitScroll = undefined;
+            removeEventListener('scroll', window._qRouterInitScroll!);
+            window._qRouterInitScroll = undefined;
 
             // Cache SPA recovery script.
             spaInit.resolve();
           }
 
           if (navType !== 'popstate') {
-            win._qRouterScrollEnabled = false;
-            clearTimeout(win._qRouterScrollDebounce);
+            window._qRouterScrollEnabled = false;
+            clearTimeout(window._qRouterScrollDebounce);
 
             // Save the final scroll state before pushing new state.
             // Upgrades/replaces state with scroll pos on nav as needed.
@@ -748,7 +769,7 @@ export const useQwikRouter = (props?: QwikRouterProps) => {
             container.setAttribute(Q_ROUTE, routeName);
             const scrollState = currentScrollState(scroller);
             saveScrollHistory(scrollState);
-            win._qRouterScrollEnabled = true;
+            window._qRouterScrollEnabled = true;
             if (isBrowser) {
               callRestoreScrollOnDocument();
             }
@@ -770,6 +791,7 @@ export const useQwikRouter = (props?: QwikRouterProps) => {
     }
 
     if (isServer) {
+      // Server: wait for navigation to complete
       return run();
     } else {
       run();
@@ -777,8 +799,9 @@ export const useQwikRouter = (props?: QwikRouterProps) => {
   });
 };
 
-/** @public This is a wrapper around the `useQwikRouter()` hook. We recommend using the hook instead of this component. */
+/** @public This is a wrapper around the `useQwikRouter()` hook. We recommend using the hook instead of this component, unless you have a good reason to make your root component reactive. */
 export const QwikRouterProvider = component$<QwikRouterProps>((props) => {
+  // Initialize Qwik Router; since this component is not reactive, the hook only runs once.
   useQwikRouter(props);
   return <Slot />;
 });
@@ -817,7 +840,6 @@ const useQwikMockRouter = (props: QwikRouterMockProps) => {
   );
 
   const loaderState = {};
-  const routeInternal = useSignal<RouteStateInternal>({ type: 'initial', dest: url });
 
   const goto: RouteNavigate =
     props.goto ??
@@ -846,7 +868,6 @@ const useQwikMockRouter = (props: QwikRouterMockProps) => {
   useContextProvider(RouteNavigateContext, goto);
   useContextProvider(RouteStateContext, loaderState);
   useContextProvider(RouteActionContext, actionState);
-  useContextProvider(RouteInternalContext, routeInternal);
 };
 
 /** @public */
diff --git a/packages/qwik-router/src/runtime/src/router-outlet-component.tsx b/packages/qwik-router/src/runtime/src/router-outlet-component.tsx
index cae675e7dd3..267d8c37969 100644
--- a/packages/qwik-router/src/runtime/src/router-outlet-component.tsx
+++ b/packages/qwik-router/src/runtime/src/router-outlet-component.tsx
@@ -54,6 +54,7 @@ export const RouterOutlet = component$(() => {
                   if (s) {
                     w.scrollTo(s.x, s.y);
                   }
+                  // Tell qwikloader to run the spaInit code
                   document.dispatchEvent(new Event('qcinit'));
                 }
               })(window, history);
diff --git a/packages/qwik-router/src/runtime/src/spa-init.ts b/packages/qwik-router/src/runtime/src/spa-init.ts
index 8bb920f38e7..0d34abb33d5 100644
--- a/packages/qwik-router/src/runtime/src/spa-init.ts
+++ b/packages/qwik-router/src/runtime/src/spa-init.ts
@@ -5,6 +5,8 @@ import type { RouteNavigate, ScrollState } from './types';
 
 import { event$, isDev } from '@qwik.dev/core';
 
+declare const window: ClientSPAWindow;
+
 // TODO Dedupe handler code from here and QwikRouterProvider?
 // TODO Navigation API; check for support & simplify.
 
@@ -15,29 +17,14 @@ import { event$, isDev } from '@qwik.dev/core';
 
 // ! DO NOT IMPORT OR USE ANY EXTERNAL REFERENCES IN THIS SCRIPT.
 export default event$((_: Event, el: Element) => {
-  const win: ClientSPAWindow = window;
-  const spa = '_qRouterSPA';
-  const initPopstate = '_qRouterInitPopstate';
-  const initAnchors = '_qRouterInitAnchors';
-  const initVisibility = '_qRouterInitVisibility';
-  const initScroll = '_qRouterInitScroll';
-  if (
-    !win[spa] &&
-    !win[initPopstate] &&
-    !win[initAnchors] &&
-    !win[initVisibility] &&
-    !win[initScroll]
-  ) {
+  // This complements qwik-router-component.ts
+  // only run once, when router didn't init yet
+  if (!window._qRouterSPA && !window._qRouterInitPopstate) {
     const currentPath = location.pathname + location.search;
 
-    const historyPatch = '_qRouterHistoryPatch';
-    const scrollEnabled = '_qRouterScrollEnabled';
-    const debounceTimeout = '_qRouterScrollDebounce';
-    const scrollHistory = '_qRouterScroll';
-
     const checkAndScroll = (scrollState: ScrollState | undefined) => {
       if (scrollState) {
-        win.scrollTo(scrollState.x, scrollState.y);
+        window.scrollTo(scrollState.x, scrollState.y);
       }
     };
 
@@ -53,20 +40,20 @@ export default event$((_: Event, el: Element) => {
 
     const saveScrollState = (scrollState?: ScrollState) => {
       const state: ScrollHistoryState = history.state || {};
-      state[scrollHistory] = scrollState || currentScrollState();
+      state._qRouterScroll = scrollState || currentScrollState();
       history.replaceState(state, '');
     };
 
     saveScrollState();
 
-    win[initPopstate] = () => {
-      if (win[spa]) {
+    window._qRouterInitPopstate = () => {
+      if (window._qRouterSPA) {
         return;
       }
 
       // Disable scroll handler eagerly to prevent overwriting history.state.
-      win[scrollEnabled] = false;
-      clearTimeout(win[debounceTimeout]);
+      window._qRouterScrollEnabled = false;
+      clearTimeout(window._qRouterScrollDebounce);
 
       if (currentPath !== location.pathname + location.search) {
         const getContainer = (el: Element) =>
@@ -88,15 +75,15 @@ export default event$((_: Event, el: Element) => {
         }
       } else {
         if (history.scrollRestoration === 'manual') {
-          const scrollState = (history.state as ScrollHistoryState)?.[scrollHistory];
+          const scrollState = (history.state as ScrollHistoryState)?._qRouterScroll;
           checkAndScroll(scrollState);
-          win[scrollEnabled] = true;
+          window._qRouterScrollEnabled = true;
         }
       }
     };
 
-    if (!win[historyPatch]) {
-      win[historyPatch] = true;
+    if (!window._qRouterHistoryPatch) {
+      window._qRouterHistoryPatch = true;
       const pushState = history.pushState;
       const replaceState = history.replaceState;
 
@@ -132,8 +119,8 @@ export default event$((_: Event, el: Element) => {
     }
 
     // We need this handler in init because Firefox destroys states w/ anchor tags.
-    win[initAnchors] = (event: MouseEvent) => {
-      if (win[spa] || event.defaultPrevented) {
+    window._qRouterInitAnchors = (event: MouseEvent) => {
+      if (window._qRouterSPA || event.defaultPrevented) {
         return;
       }
 
@@ -160,8 +147,8 @@ export default event$((_: Event, el: Element) => {
             } else {
               // Simulate same-page (no hash) anchor reload.
               // history.scrollRestoration = 'manual' makes these not scroll.
-              win[scrollEnabled] = false;
-              clearTimeout(win[debounceTimeout]);
+              window._qRouterScrollEnabled = false;
+              clearTimeout(window._qRouterScrollDebounce);
               saveScrollState({ ...currentScrollState(), x: 0, y: 0 });
               location.reload();
             }
@@ -176,34 +163,38 @@ export default event$((_: Event, el: Element) => {
       }
     };
 
-    win[initVisibility] = () => {
-      if (!win[spa] && win[scrollEnabled] && document.visibilityState === 'hidden') {
+    window._qRouterInitVisibility = () => {
+      if (
+        !window._qRouterSPA &&
+        window._qRouterScrollEnabled &&
+        document.visibilityState === 'hidden'
+      ) {
         saveScrollState();
       }
     };
 
-    win[initScroll] = () => {
-      if (win[spa] || !win[scrollEnabled]) {
+    window._qRouterInitScroll = () => {
+      if (window._qRouterSPA || !window._qRouterScrollEnabled) {
         return;
       }
 
-      clearTimeout(win[debounceTimeout]);
-      win[debounceTimeout] = setTimeout(() => {
+      clearTimeout(window._qRouterScrollDebounce);
+      window._qRouterScrollDebounce = setTimeout(() => {
         saveScrollState();
         // Needed for e2e debounceDetector.
-        win[debounceTimeout] = undefined;
+        window._qRouterScrollDebounce = undefined;
       }, 200);
     };
 
-    win[scrollEnabled] = true;
+    window._qRouterScrollEnabled = true;
 
     setTimeout(() => {
-      win.addEventListener('popstate', win[initPopstate]!);
-      win.addEventListener('scroll', win[initScroll]!, { passive: true });
-      document.body.addEventListener('click', win[initAnchors]!);
+      window.addEventListener('popstate', window._qRouterInitPopstate!);
+      window.addEventListener('scroll', window._qRouterInitScroll!, { passive: true });
+      document.addEventListener('click', window._qRouterInitAnchors!);
 
-      if (!(win as any).navigation) {
-        document.addEventListener('visibilitychange', win[initVisibility]!, {
+      if (!(window as any).navigation) {
+        document.addEventListener('visibilitychange', window._qRouterInitVisibility!, {
           passive: true,
         });
       }
diff --git a/packages/qwik/src/core/shared/scheduler.ts b/packages/qwik/src/core/shared/scheduler.ts
index c2febc0e72c..58ed91d9d89 100644
--- a/packages/qwik/src/core/shared/scheduler.ts
+++ b/packages/qwik/src/core/shared/scheduler.ts
@@ -562,7 +562,8 @@ This is often caused by modifying a signal in an already rendered component duri
             })
             .catch((e) => {
               if (chore.$state$ !== ChoreState.RUNNING) {
-                // we already handled the error
+                // we already handled an error but maybe it's a different one so we log it
+                console.error(e);
                 return;
               }
               handleError(chore, e);
diff --git a/packages/qwik/src/core/shared/serdes/allocate.ts b/packages/qwik/src/core/shared/serdes/allocate.ts
index 36d1b522b04..e314c46c79e 100644
--- a/packages/qwik/src/core/shared/serdes/allocate.ts
+++ b/packages/qwik/src/core/shared/serdes/allocate.ts
@@ -103,7 +103,7 @@ export const allocate = (container: DeserializeContainer, typeId: number, value:
       const storeValue = allocate(container, t, v);
       const store = getOrCreateStore(storeValue, StoreFlags.NONE, container as DomContainer);
       if (needsInflation(t)) {
-        pendingStoreTargets.set(store, { t, v });
+        pendingStoreTargets.set(storeValue, { t, v });
       }
       // We must store the reference so it doesn't get deserialized again in inflate()
       data[0] = TypeIds.Plain;
diff --git a/packages/qwik/src/core/shared/serdes/inflate.ts b/packages/qwik/src/core/shared/serdes/inflate.ts
index 6530054b7e1..352f4c75fae 100644
--- a/packages/qwik/src/core/shared/serdes/inflate.ts
+++ b/packages/qwik/src/core/shared/serdes/inflate.ts
@@ -3,7 +3,7 @@ import { _EFFECT_BACK_REF } from '../../internal';
 import type { AsyncComputedSignalImpl } from '../../reactive-primitives/impl/async-computed-signal-impl';
 import type { ComputedSignalImpl } from '../../reactive-primitives/impl/computed-signal-impl';
 import type { SignalImpl } from '../../reactive-primitives/impl/signal-impl';
-import { getStoreHandler } from '../../reactive-primitives/impl/store';
+import { getStoreHandler, unwrapStore } from '../../reactive-primitives/impl/store';
 import type { WrappedSignalImpl } from '../../reactive-primitives/impl/wrapped-signal-impl';
 import type { SubscriptionData } from '../../reactive-primitives/subscription-data';
 import {
@@ -102,7 +102,7 @@ export const inflate = (
       break;
     case TypeIds.Store: {
       // Inflate the store target
-      const store = target as object;
+      const store = unwrapStore(target) as object;
       const storeTarget = pendingStoreTargets.get(store);
       if (storeTarget) {
         pendingStoreTargets.delete(store);
@@ -113,7 +113,7 @@ export const inflate = (
        * they are already inflated in the deserialize of the data, above.
        */
       const [, flags, effects] = data as unknown[];
-      const storeHandler = getStoreHandler(store)!;
+      const storeHandler = getStoreHandler(target as object)!;
       storeHandler.$flags$ = flags as StoreFlags;
       storeHandler.$effects$ = effects as any;
       break;