diff --git a/e2e/fixtures/create-pages/package.json b/e2e/fixtures/create-pages/package.json
index 58e25c8e9..a6ce7c75f 100644
--- a/e2e/fixtures/create-pages/package.json
+++ b/e2e/fixtures/create-pages/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "react": "19.0.0",
     "react-dom": "19.0.0",
-    "react-error-boundary": "^5.0.0",
+    "react-error-boundary": "5.0.0",
     "react-server-dom-webpack": "19.0.0",
     "waku": "workspace:*"
   },
diff --git a/e2e/fixtures/create-pages/src/components/HomeLayout.tsx b/e2e/fixtures/create-pages/src/components/HomeLayout.tsx
index 5d5911f13..fab63a7c1 100644
--- a/e2e/fixtures/create-pages/src/components/HomeLayout.tsx
+++ b/e2e/fixtures/create-pages/src/components/HomeLayout.tsx
@@ -18,6 +18,7 @@ const Pending = ({ isPending }: { isPending: boolean }) => (
 
 const HomeLayout = ({ children }: { children: ReactNode }) => (
   <div>
+    <title>Waku</title>
     <ul>
       <li>
         <Link
diff --git a/e2e/fixtures/create-pages/src/components/Root.tsx b/e2e/fixtures/create-pages/src/components/Root.tsx
deleted file mode 100644
index 3dc1162c8..000000000
--- a/e2e/fixtures/create-pages/src/components/Root.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import type { ReactNode } from 'react';
-
-export default function Root({ children }: { children: ReactNode }) {
-  return (
-    <html>
-      <head>
-        <title>Waku</title>
-      </head>
-      <body>{children}</body>
-    </html>
-  );
-}
diff --git a/e2e/fixtures/create-pages/src/entries.tsx b/e2e/fixtures/create-pages/src/entries.tsx
index ec2be01ac..0ade82b8d 100644
--- a/e2e/fixtures/create-pages/src/entries.tsx
+++ b/e2e/fixtures/create-pages/src/entries.tsx
@@ -5,18 +5,12 @@ import FooPage from './components/FooPage.js';
 import HomeLayout from './components/HomeLayout.js';
 import HomePage from './components/HomePage.js';
 import NestedBazPage from './components/NestedBazPage.js';
-import Root from './components/Root.js';
 import NestedLayout from './components/NestedLayout.js';
 import { DeeplyNestedLayout } from './components/DeeplyNestedLayout.js';
 import ErrorPage from './components/ErrorPage.js';
 
 const pages: ReturnType<typeof createPages> = createPages(
-  async ({ createPage, createLayout, createRoot }) => [
-    createRoot({
-      render: 'static',
-      component: Root,
-    }),
-
+  async ({ createPage, createLayout }) => [
     createLayout({
       render: 'static',
       path: '/',
diff --git a/e2e/fixtures/define-router/src/entries.tsx b/e2e/fixtures/define-router/src/entries.tsx
index 047aaa2e9..6522a666b 100644
--- a/e2e/fixtures/define-router/src/entries.tsx
+++ b/e2e/fixtures/define-router/src/entries.tsx
@@ -21,9 +21,9 @@ const router: ReturnType<typeof defineRouter> = defineRouter({
         .split('/')
         .filter(Boolean)
         .map((name) => ({ type: 'literal', name })),
+      rootElement: { isStatic: true },
       routeElement: { isStatic: true },
       elements: {
-        root: { isStatic: true },
         'layout:/': { isStatic: true },
         [`page:${path}`]: { isStatic: true },
       },
@@ -33,24 +33,22 @@ const router: ReturnType<typeof defineRouter> = defineRouter({
       throw new Error('renderRoute: No such path:' + path);
     }
     return {
+      rootElement: (
+        <html>
+          <head>
+            <title>Waku example</title>
+          </head>
+          <body>
+            <Children />
+          </body>
+        </html>
+      ),
       routeElement: (
-        <Slot id="root">
-          <Slot id="layout:/">
-            <Slot id={`page:${path}`} />
-          </Slot>
+        <Slot id="layout:/">
+          <Slot id={`page:${path}`} />
         </Slot>
       ),
       elements: {
-        root: (
-          <html>
-            <head>
-              <title>Waku example</title>
-            </head>
-            <body>
-              <Children />
-            </body>
-          </html>
-        ),
         'layout:/': (
           <Layout>
             <Children />
diff --git a/examples/22_define-router/src/entries.tsx b/examples/22_define-router/src/entries.tsx
index 2873860a5..e550d8f28 100644
--- a/examples/22_define-router/src/entries.tsx
+++ b/examples/22_define-router/src/entries.tsx
@@ -15,9 +15,9 @@ export default defineRouter({
       {
         pattern: '/',
         path: [],
+        rootElement: { isStatic: true },
         routeElement: { isStatic: true },
         elements: {
-          root: { isStatic: true },
           'layout:/': { isStatic: true },
           'page:/': { isStatic: true },
         },
@@ -25,9 +25,9 @@ export default defineRouter({
       {
         pattern: '/foo',
         path: [{ type: 'literal', name: 'foo' }],
+        rootElement: { isStatic: true },
         routeElement: { isStatic: true },
         elements: {
-          root: { isStatic: true },
           'layout:/': { isStatic: true },
           'page:/foo': { isStatic: true },
         },
@@ -35,9 +35,9 @@ export default defineRouter({
       {
         pattern: '/bar',
         path: [{ type: 'literal', name: 'bar' }],
+        rootElement: { isStatic: true },
         routeElement: { isStatic: true },
         elements: {
-          root: { isStatic: true },
           'layout:/': { isStatic: true },
           'page:/bar': { isStatic: true },
         },
@@ -48,9 +48,9 @@ export default defineRouter({
           { type: 'literal', name: 'nested' },
           { type: 'literal', name: 'baz' },
         ],
+        rootElement: { isStatic: true },
         routeElement: { isStatic: true },
         elements: {
-          root: { isStatic: true },
           'layout:/': { isStatic: true },
           'page:/nested/baz': { isStatic: true },
         },
@@ -61,9 +61,9 @@ export default defineRouter({
           { type: 'literal', name: 'dynamic' },
           { type: 'group', name: 'slug' },
         ],
+        rootElement: { isStatic: true },
         routeElement: { isStatic: true },
         elements: {
-          root: { isStatic: true },
           'layout:/': { isStatic: true },
           // using `[slug]` syntax is just an example and it technically conflicts with others. So, it's better to use a different prefix like `dynamic-page:`.
           'page:/dynamic/[slug]': {},
@@ -74,19 +74,17 @@ export default defineRouter({
   handleRoute: async (path) => {
     if (path === '/') {
       return {
+        rootElement: (
+          <Root>
+            <Children />
+          </Root>
+        ),
         routeElement: (
-          <Slot id="root">
-            <Slot id="layout:/">
-              <Slot id="page:/" />
-            </Slot>
+          <Slot id="layout:/">
+            <Slot id="page:/" />
           </Slot>
         ),
         elements: {
-          root: (
-            <Root>
-              <Children />
-            </Root>
-          ),
           'layout:/': (
             <HomeLayout>
               <Children />
@@ -98,19 +96,17 @@ export default defineRouter({
     }
     if (path === '/foo') {
       return {
+        rootElement: (
+          <Root>
+            <Children />
+          </Root>
+        ),
         routeElement: (
-          <Slot id="root">
-            <Slot id="layout:/">
-              <Slot id="page:/foo" />
-            </Slot>
+          <Slot id="layout:/">
+            <Slot id="page:/foo" />
           </Slot>
         ),
         elements: {
-          root: (
-            <Root>
-              <Children />
-            </Root>
-          ),
           'layout:/': (
             <HomeLayout>
               <Children />
@@ -122,19 +118,17 @@ export default defineRouter({
     }
     if (path === '/bar') {
       return {
+        rootElement: (
+          <Root>
+            <Children />
+          </Root>
+        ),
         routeElement: (
-          <Slot id="root">
-            <Slot id="layout:/">
-              <Slot id="page:/bar" />
-            </Slot>
+          <Slot id="layout:/">
+            <Slot id="page:/bar" />
           </Slot>
         ),
         elements: {
-          root: (
-            <Root>
-              <Children />
-            </Root>
-          ),
           'layout:/': (
             <HomeLayout>
               <Children />
@@ -146,19 +140,17 @@ export default defineRouter({
     }
     if (path === '/nested/baz') {
       return {
+        rootElement: (
+          <Root>
+            <Children />
+          </Root>
+        ),
         routeElement: (
-          <Slot id="root">
-            <Slot id="layout:/">
-              <Slot id="page:/nested/baz" />
-            </Slot>
+          <Slot id="layout:/">
+            <Slot id="page:/nested/baz" />
           </Slot>
         ),
         elements: {
-          root: (
-            <Root>
-              <Children />
-            </Root>
-          ),
           'layout:/': (
             <HomeLayout>
               <Children />
@@ -170,19 +162,17 @@ export default defineRouter({
     }
     if (path.startsWith('/dynamic/')) {
       return {
+        rootElement: (
+          <Root>
+            <Children />
+          </Root>
+        ),
         routeElement: (
-          <Slot id="root">
-            <Slot id="layout:/">
-              <Slot id="page:/dynamic/[slug]" />
-            </Slot>
+          <Slot id="layout:/">
+            <Slot id="page:/dynamic/[slug]" />
           </Slot>
         ),
         elements: {
-          root: (
-            <Root>
-              <Children />
-            </Root>
-          ),
           'layout:/': (
             <HomeLayout>
               <Children />
diff --git a/examples/22_define-router/src/main.tsx b/examples/22_define-router/src/main.tsx
index bddb502d5..2bfe6e4cd 100644
--- a/examples/22_define-router/src/main.tsx
+++ b/examples/22_define-router/src/main.tsx
@@ -1,10 +1,12 @@
 import { StrictMode } from 'react';
 import { createRoot, hydrateRoot } from 'react-dom/client';
-import { Router } from 'waku/router/client';
+import { Router, ErrorBoundary } from 'waku/router/client';
 
 const rootElement = (
   <StrictMode>
-    <Router />
+    <ErrorBoundary>
+      <Router />
+    </ErrorBoundary>
   </StrictMode>
 );
 
diff --git a/packages/waku/src/lib/plugins/vite-plugin-rsc-transform.ts b/packages/waku/src/lib/plugins/vite-plugin-rsc-transform.ts
index 07d7bfbc3..e8d8eb4cc 100644
--- a/packages/waku/src/lib/plugins/vite-plugin-rsc-transform.ts
+++ b/packages/waku/src/lib/plugins/vite-plugin-rsc-transform.ts
@@ -16,6 +16,8 @@ const collectExportNames = (mod: swc.Module) => {
     if (item.type === 'ExportDeclaration') {
       if (item.declaration.type === 'FunctionDeclaration') {
         exportNames.add(item.declaration.identifier.value);
+      } else if (item.declaration.type === 'ClassDeclaration') {
+        exportNames.add(item.declaration.identifier.value);
       } else if (item.declaration.type === 'VariableDeclaration') {
         for (const d of item.declaration.declarations) {
           if (d.id.type === 'Identifier') {
diff --git a/packages/waku/src/minimal/client.ts b/packages/waku/src/minimal/client.ts
index 3c6a9f56f..4ca6c683a 100644
--- a/packages/waku/src/minimal/client.ts
+++ b/packages/waku/src/minimal/client.ts
@@ -9,6 +9,7 @@ import {
   useCallback,
   useEffect,
   useState,
+  Component,
 } from 'react';
 import type { ReactNode } from 'react';
 import RSDWClient from 'react-server-dom-webpack/client';
@@ -244,22 +245,56 @@ const InnerSlot = ({
   id,
   elementsPromise,
   children,
+  setFallback,
 }: {
   id: string;
   elementsPromise: Elements;
   children?: ReactNode;
+  setFallback?: (fallback: ReactNode) => void;
 }) => {
   const elements = use(elementsPromise);
   if (!(id in elements)) {
     throw new Error('No such element: ' + id);
   }
-  return createElement(
-    ChildrenContextProvider,
-    { value: children },
-    elements[id],
-  );
+  const element = elements[id];
+  useEffect(() => {
+    if (setFallback) {
+      setFallback(element);
+    }
+  }, [element, setFallback]);
+  return createElement(ChildrenContextProvider, { value: children }, element);
 };
 
+const ThrowError = ({ error }: { error: unknown }) => {
+  throw error;
+};
+
+class Fallback extends Component<
+  { children: ReactNode; fallback: ReactNode },
+  { error?: unknown }
+> {
+  constructor(props: { children: ReactNode; fallback: ReactNode }) {
+    super(props);
+    this.state = {};
+  }
+  static getDerivedStateFromError(error: unknown) {
+    return { error };
+  }
+  render() {
+    if ('error' in this.state) {
+      if (this.props.fallback) {
+        return createElement(
+          ChildrenContextProvider,
+          { value: createElement(ThrowError, { error: this.state.error }) },
+          this.props.fallback,
+        );
+      }
+      throw this.state.error;
+    }
+    return this.props.children;
+  }
+}
+
 /**
  * Slot component
  * This is used under the Root component.
@@ -277,14 +312,24 @@ const InnerSlot = ({
 export const Slot = ({
   id,
   children,
+  unstable_fallbackToPrev,
 }: {
   id: string;
   children?: ReactNode;
+  unstable_fallbackToPrev?: boolean;
 }) => {
+  const [fallback, setFallback] = useState<ReactNode>();
   const elementsPromise = use(ElementsContext);
   if (!elementsPromise) {
     throw new Error('Missing Root component');
   }
+  if (unstable_fallbackToPrev) {
+    return createElement(
+      Fallback,
+      { fallback } as never,
+      createElement(InnerSlot, { id, elementsPromise, setFallback }, children),
+    );
+  }
   return createElement(InnerSlot, { id, elementsPromise }, children);
 };
 
diff --git a/packages/waku/src/router/client.ts b/packages/waku/src/router/client.ts
index c68436da7..5a53256a7 100644
--- a/packages/waku/src/router/client.ts
+++ b/packages/waku/src/router/client.ts
@@ -1,7 +1,6 @@
 'use client';
 
 import {
-  Component,
   createContext,
   createElement,
   startTransition,
@@ -12,6 +11,7 @@ import {
   useState,
   useTransition,
   Fragment,
+  Component,
 } from 'react';
 import type {
   ComponentProps,
@@ -280,7 +280,7 @@ function renderError(message: string) {
   );
 }
 
-class ErrorBoundary extends Component<
+export class ErrorBoundary extends Component<
   { children: ReactNode },
   { error?: unknown }
 > {
@@ -412,14 +412,16 @@ const InnerRouter = ({
     };
   }, [changeRoute, locationListeners]);
 
-  const routeElement = createElement(Slot, {
-    id: getRouteSlotId(route.path),
-  });
-
+  const routeElement = createElement(Slot, { id: getRouteSlotId(route.path) });
+  const rootElement = createElement(
+    Slot,
+    { id: 'root', unstable_fallbackToPrev: true },
+    routeElement,
+  );
   return createElement(
     RouterContext.Provider,
     { value: { route, changeRoute, prefetchRoute } },
-    routeElement,
+    rootElement,
   );
 };
 
@@ -504,21 +506,17 @@ export function Router({
     };
   const initialRscParams = createRscParams(initialRoute.query);
   return createElement(
-    ErrorBoundary,
-    null,
-    createElement(
-      Root as FunctionComponent<Omit<ComponentProps<typeof Root>, 'children'>>,
-      {
-        initialRscPath,
-        initialRscParams,
-        unstable_enhanceFetch,
-        unstable_enhanceCreateData,
-      },
-      createElement(InnerRouter, {
-        routerData: routerData as Required<RouterData>,
-        initialRoute,
-      }),
-    ),
+    Root as FunctionComponent<Omit<ComponentProps<typeof Root>, 'children'>>,
+    {
+      initialRscPath,
+      initialRscParams,
+      unstable_enhanceFetch,
+      unstable_enhanceCreateData,
+    },
+    createElement(InnerRouter, {
+      routerData: routerData as Required<RouterData>,
+      initialRoute,
+    }),
   );
 }
 
@@ -528,6 +526,11 @@ export function Router({
  */
 export function ServerRouter({ route }: { route: RouteProps }) {
   const routeElement = createElement(Slot, { id: getRouteSlotId(route.path) });
+  const rootElement = createElement(
+    Slot,
+    { id: 'root', unstable_fallbackToPrev: true },
+    routeElement,
+  );
   return createElement(
     Fragment,
     null,
@@ -540,7 +543,7 @@ export function ServerRouter({ route }: { route: RouteProps }) {
           prefetchRoute: notAvailableInServer('prefetchRoute'),
         },
       },
-      routeElement,
+      rootElement,
     ),
   );
 }
diff --git a/packages/waku/src/router/create-pages.ts b/packages/waku/src/router/create-pages.ts
index 3b7a93164..d6768ad86 100644
--- a/packages/waku/src/router/create-pages.ts
+++ b/packages/waku/src/router/create-pages.ts
@@ -16,6 +16,7 @@ import type {
   PropsForPages,
 } from './create-pages-utils/inferred-path-types.js';
 import { Children, Slot } from '../minimal/client.js';
+import { ErrorBoundary } from '../router/client.js';
 
 const sanitizeSlug = (slug: string) =>
   slug.replace(/\./g, '').replace(/ /g, '-');
@@ -174,10 +175,14 @@ export type CreateRoot = (root: RootItem) => void;
  */
 const DefaultRoot = ({ children }: { children: ReactNode }) =>
   createElement(
-    'html',
+    ErrorBoundary,
     null,
-    createElement('head', null),
-    createElement('body', null, children),
+    createElement(
+      'html',
+      null,
+      createElement('head', null),
+      createElement('body', null, children),
+    ),
   );
 
 const createNestedElements = (
@@ -437,6 +442,7 @@ export const createPages = <
       const paths: {
         path: PathSpec;
         pathPattern?: PathSpec;
+        rootElement: { isStatic?: boolean };
         routeElement: { isStatic?: boolean };
         elements: Record<string, { isStatic?: boolean }>;
         noSsr: boolean;
@@ -458,13 +464,13 @@ export const createPages = <
             },
             {},
           ),
-          root: { isStatic: rootIsStatic },
           [`page:${path}`]: { isStatic: staticPathMap.has(path) },
         };
 
         paths.push({
           path: literalSpec,
           ...(originalSpec && { pathPattern: originalSpec }),
+          rootElement: { isStatic: rootIsStatic },
           routeElement: {
             isStatic: true,
           },
@@ -485,11 +491,11 @@ export const createPages = <
             },
             {},
           ),
-          root: { isStatic: rootIsStatic },
           [`page:${path}`]: { isStatic: false },
         };
         paths.push({
           path: pathSpec,
+          rootElement: { isStatic: rootIsStatic },
           routeElement: { isStatic: true },
           elements,
           noSsr,
@@ -508,11 +514,11 @@ export const createPages = <
             },
             {},
           ),
-          root: { isStatic: rootIsStatic },
           [`page:${path}`]: { isStatic: false },
         };
         paths.push({
           path: pathSpec,
+          rootElement: { isStatic: rootIsStatic },
           routeElement: { isStatic: true },
           elements,
           noSsr,
@@ -541,11 +547,6 @@ export const createPages = <
       const pathSpec = parsePathWithSlug(routePath);
       const mapping = getPathMapping(pathSpec, path);
       const result: Record<string, ReactNode> = {
-        root: createElement(
-          rootItem ? rootItem.component : DefaultRoot,
-          null,
-          createElement(Children),
-        ),
         [`page:${routePath}`]: createElement(
           pageComponent,
           { ...mapping, ...(query ? { query } : {}), path },
@@ -586,11 +587,12 @@ export const createPages = <
 
       return {
         elements: result,
-        routeElement: createElement(
-          Slot,
-          { id: 'root' },
-          createNestedElements(routeChildren),
+        rootElement: createElement(
+          rootItem ? rootItem.component : DefaultRoot,
+          null,
+          createElement(Children),
         ),
+        routeElement: createNestedElements(routeChildren),
       };
     },
     getApiConfig: async () => {
diff --git a/packages/waku/src/router/define-router.ts b/packages/waku/src/router/define-router.ts
index 2e8159a5d..ae86ea58b 100644
--- a/packages/waku/src/router/define-router.ts
+++ b/packages/waku/src/router/define-router.ts
@@ -77,6 +77,7 @@ export function unstable_defineRouter(fns: {
     Iterable<{
       path: PathSpec;
       pathPattern?: PathSpec;
+      rootElement: { isStatic?: boolean };
       routeElement: { isStatic?: boolean };
       elements: Record<SlotId, { isStatic?: boolean }>;
       noSsr?: boolean;
@@ -88,6 +89,7 @@ export function unstable_defineRouter(fns: {
       query?: string;
     },
   ) => Promise<{
+    rootElement: ReactNode;
     routeElement: ReactNode;
     elements: Record<SlotId, ReactNode>;
   }>;
@@ -137,6 +139,7 @@ export function unstable_defineRouter(fns: {
             item.path[0]!.type === 'literal' &&
             item.path[0]!.name === '404';
           const isStatic =
+            !!item.rootElement.isStatic &&
             !!item.routeElement.isStatic &&
             Object.values(item.elements).every((x) => x.isStatic);
           return {
@@ -209,7 +212,7 @@ export function unstable_defineRouter(fns: {
     }
     const skip = isStringArray(skipParam) ? skipParam : [];
     const { query } = parseRscParams(rscParams);
-    const { routeElement, elements } = await fns.handleRoute(
+    const { rootElement, routeElement, elements } = await fns.handleRoute(
       pathname,
       pathConfigItem.specs.isStatic ? {} : { query },
     );
@@ -220,6 +223,7 @@ export function unstable_defineRouter(fns: {
     }
     const entries = {
       ...elements,
+      root: rootElement,
       [ROUTE_SLOT_ID_PREFIX + pathname]: routeElement,
     };
     for (const skipId of await filterEffectiveSkip(pathname, skip)) {
diff --git a/packages/waku/tests/create-pages.test.ts b/packages/waku/tests/create-pages.test.ts
index 5f277bc44..bcfc43c70 100644
--- a/packages/waku/tests/create-pages.test.ts
+++ b/packages/waku/tests/create-pages.test.ts
@@ -493,9 +493,9 @@ describe('createPages pages and layouts', () => {
     expect(await getRouteConfig()).toEqual([
       {
         elements: {
-          root: { isStatic: true },
           'page:/test': { isStatic: true },
         },
+        rootElement: { isStatic: true },
         routeElement: { isStatic: true },
         noSsr: false,
         path: [{ name: 'test', type: 'literal' }],
@@ -506,8 +506,9 @@ describe('createPages pages and layouts', () => {
       query: '?skip=[]',
     });
     expect(route).toBeDefined();
+    expect(route.rootElement).toBeDefined();
     expect(route.routeElement).toBeDefined();
-    expect(Object.keys(route.elements)).toEqual(['root', 'page:/test']);
+    expect(Object.keys(route.elements)).toEqual(['page:/test']);
   });
 
   it('creates a simple dynamic page', async () => {
@@ -523,9 +524,9 @@ describe('createPages pages and layouts', () => {
     expect(await getRouteConfig()).toEqual([
       {
         elements: {
-          root: { isStatic: true },
           'page:/test': { isStatic: false },
         },
+        rootElement: { isStatic: true },
         routeElement: { isStatic: true },
         noSsr: false,
         path: [{ name: 'test', type: 'literal' }],
@@ -535,8 +536,9 @@ describe('createPages pages and layouts', () => {
       query: '?skip=[]',
     });
     expect(route).toBeDefined();
+    expect(route.rootElement).toBeDefined();
     expect(route.routeElement).toBeDefined();
-    expect(Object.keys(route.elements)).toEqual(['root', 'page:/test']);
+    expect(Object.keys(route.elements)).toEqual(['page:/test']);
   });
 
   it('creates a simple static api', async () => {
@@ -627,9 +629,9 @@ describe('createPages pages and layouts', () => {
       {
         elements: {
           'layout:/': { isStatic: true },
-          root: { isStatic: true },
           'page:/test': { isStatic: true },
         },
+        rootElement: { isStatic: true },
         routeElement: { isStatic: true },
         noSsr: false,
         path: [{ name: 'test', type: 'literal' }],
@@ -639,12 +641,9 @@ describe('createPages pages and layouts', () => {
       query: '?skip=[]',
     });
     expect(route).toBeDefined();
+    expect(route.rootElement).toBeDefined();
     expect(route.routeElement).toBeDefined();
-    expect(Object.keys(route.elements)).toEqual([
-      'root',
-      'page:/test',
-      'layout:/',
-    ]);
+    expect(Object.keys(route.elements)).toEqual(['page:/test', 'layout:/']);
   });
 
   it('creates a simple dynamic page with a layout', async () => {
@@ -668,9 +667,9 @@ describe('createPages pages and layouts', () => {
       {
         elements: {
           'layout:/': { isStatic: false },
-          root: { isStatic: true },
           'page:/test': { isStatic: false },
         },
+        rootElement: { isStatic: true },
         routeElement: { isStatic: true },
         noSsr: false,
         path: [{ name: 'test', type: 'literal' }],
@@ -681,12 +680,9 @@ describe('createPages pages and layouts', () => {
       query: '?skip=[]',
     });
     expect(route).toBeDefined();
+    expect(route.rootElement).toBeDefined();
     expect(route.routeElement).toBeDefined();
-    expect(Object.keys(route.elements)).toEqual([
-      'root',
-      'page:/test',
-      'layout:/',
-    ]);
+    expect(Object.keys(route.elements)).toEqual(['page:/test', 'layout:/']);
   });
 
   it('creates a nested static page', async () => {
@@ -702,9 +698,9 @@ describe('createPages pages and layouts', () => {
     expect(await getRouteConfig()).toEqual([
       {
         elements: {
-          root: { isStatic: true },
           'page:/test/nested': { isStatic: true },
         },
+        rootElement: { isStatic: true },
         routeElement: { isStatic: true },
         noSsr: false,
         path: [
@@ -717,8 +713,9 @@ describe('createPages pages and layouts', () => {
       query: '?skip=[]',
     });
     expect(route).toBeDefined();
+    expect(route.rootElement).toBeDefined();
     expect(route.routeElement).toBeDefined();
-    expect(Object.keys(route.elements)).toEqual(['root', 'page:/test/nested']);
+    expect(Object.keys(route.elements)).toEqual(['page:/test/nested']);
   });
 
   it('creates a nested static page with nested layout', async () => {
@@ -739,10 +736,10 @@ describe('createPages pages and layouts', () => {
     expect(await getRouteConfig()).toEqual([
       {
         elements: {
-          root: { isStatic: true },
           'page:/test/nested': { isStatic: true },
           'layout:/test/nested': { isStatic: true },
         },
+        rootElement: { isStatic: true },
         routeElement: { isStatic: true },
         noSsr: false,
         path: [
@@ -755,9 +752,9 @@ describe('createPages pages and layouts', () => {
       query: '?skip=[]',
     });
     expect(route).toBeDefined();
+    expect(route.rootElement).toBeDefined();
     expect(route.routeElement).toBeDefined();
     expect(Object.keys(route.elements)).toEqual([
-      'root',
       'page:/test/nested',
       'layout:/test/nested',
     ]);
@@ -776,9 +773,9 @@ describe('createPages pages and layouts', () => {
     expect(await getRouteConfig()).toEqual([
       {
         elements: {
-          root: { isStatic: true },
           'page:/test/nested': { isStatic: false },
         },
+        rootElement: { isStatic: true },
         routeElement: { isStatic: true },
         noSsr: false,
         path: [
@@ -792,8 +789,9 @@ describe('createPages pages and layouts', () => {
       query: '?skip=[]',
     });
     expect(route).toBeDefined();
+    expect(route.rootElement).toBeDefined();
     expect(route.routeElement).toBeDefined();
-    expect(Object.keys(route.elements)).toEqual(['root', 'page:/test/nested']);
+    expect(Object.keys(route.elements)).toEqual(['page:/test/nested']);
   });
 
   it('creates a static page with slugs', async () => {
@@ -813,9 +811,9 @@ describe('createPages pages and layouts', () => {
     expect(await getRouteConfig()).toEqual([
       {
         elements: {
-          root: { isStatic: true },
           'page:/test/w/x': { isStatic: true },
         },
+        rootElement: { isStatic: true },
         routeElement: { isStatic: true },
         noSsr: false,
         path: [
@@ -831,9 +829,9 @@ describe('createPages pages and layouts', () => {
       },
       {
         elements: {
-          root: { isStatic: true },
           'page:/test/y/z': { isStatic: true },
         },
+        rootElement: { isStatic: true },
         routeElement: { isStatic: true },
         noSsr: false,
         path: [
@@ -852,8 +850,9 @@ describe('createPages pages and layouts', () => {
       query: '?skip=[]',
     });
     expect(route).toBeDefined();
+    expect(route.rootElement).toBeDefined();
     expect(route.routeElement).toBeDefined();
-    expect(Object.keys(route.elements)).toEqual(['root', 'page:/test/y/z']);
+    expect(Object.keys(route.elements)).toEqual(['page:/test/y/z']);
   });
 
   it('creates a dynamic page with slugs', async () => {
@@ -869,9 +868,9 @@ describe('createPages pages and layouts', () => {
     expect(await getRouteConfig()).toEqual([
       {
         elements: {
-          root: { isStatic: true },
           'page:/test/[a]/[b]': { isStatic: false },
         },
+        rootElement: { isStatic: true },
         routeElement: { isStatic: true },
         noSsr: false,
         path: [
@@ -885,8 +884,9 @@ describe('createPages pages and layouts', () => {
       query: '?skip=[]',
     });
     expect(route).toBeDefined();
+    expect(route.rootElement).toBeDefined();
     expect(route.routeElement).toBeDefined();
-    expect(Object.keys(route.elements)).toEqual(['root', 'page:/test/[a]/[b]']);
+    expect(Object.keys(route.elements)).toEqual(['page:/test/[a]/[b]']);
   });
 
   it('creates a static page with wildcards', async () => {
@@ -903,9 +903,9 @@ describe('createPages pages and layouts', () => {
     expect(await getRouteConfig()).toEqual([
       {
         elements: {
-          root: { isStatic: true },
           'page:/test/a/b': { isStatic: true },
         },
+        rootElement: { isStatic: true },
         routeElement: { isStatic: true },
         noSsr: false,
         path: [
@@ -923,8 +923,9 @@ describe('createPages pages and layouts', () => {
       query: '?skip=[]',
     });
     expect(route).toBeDefined();
+    expect(route.rootElement).toBeDefined();
     expect(route.routeElement).toBeDefined();
-    expect(Object.keys(route.elements)).toEqual(['root', 'page:/test/a/b']);
+    expect(Object.keys(route.elements)).toEqual(['page:/test/a/b']);
   });
 
   it('creates a dynamic page with wildcards', async () => {
@@ -940,9 +941,9 @@ describe('createPages pages and layouts', () => {
     expect(await getRouteConfig()).toEqual([
       {
         elements: {
-          root: { isStatic: true },
           'page:/test/[...path]': { isStatic: false },
         },
+        rootElement: { isStatic: true },
         routeElement: { isStatic: true },
         noSsr: false,
         path: [
@@ -955,11 +956,9 @@ describe('createPages pages and layouts', () => {
       query: '?skip=[]',
     });
     expect(route).toBeDefined();
+    expect(route.rootElement).toBeDefined();
     expect(route.routeElement).toBeDefined();
-    expect(Object.keys(route.elements)).toEqual([
-      'root',
-      'page:/test/[...path]',
-    ]);
+    expect(Object.keys(route.elements)).toEqual(['page:/test/[...path]']);
   });
 
   it('fails if static paths do not match the slug pattern', async () => {
@@ -997,18 +996,18 @@ describe('createPages pages and layouts', () => {
     expect(await getRouteConfig()).toEqual([
       {
         elements: {
-          root: { isStatic: true },
           'page:/static': { isStatic: true },
         },
+        rootElement: { isStatic: true },
         routeElement: { isStatic: true },
         noSsr: true,
         path: [{ name: 'static', type: 'literal' }],
       },
       {
         elements: {
-          root: { isStatic: true },
           'page:/dynamic': { isStatic: false },
         },
+        rootElement: { isStatic: true },
         routeElement: { isStatic: true },
         noSsr: true,
         path: [{ name: 'dynamic', type: 'literal' }],
@@ -1081,9 +1080,9 @@ describe('createPages pages and layouts', () => {
     expect(await getRouteConfig()).toEqual([
       {
         elements: {
-          root: { isStatic: true },
           'page:/client/static': { isStatic: true },
         },
+        rootElement: { isStatic: true },
         routeElement: { isStatic: true },
         noSsr: false,
         path: [
@@ -1093,9 +1092,9 @@ describe('createPages pages and layouts', () => {
       },
       {
         elements: {
-          root: { isStatic: true },
           'page:/server/static/static-echo': { isStatic: true },
         },
+        rootElement: { isStatic: true },
         routeElement: { isStatic: true },
         noSsr: false,
         path: [
@@ -1111,9 +1110,9 @@ describe('createPages pages and layouts', () => {
       },
       {
         elements: {
-          root: { isStatic: true },
           'page:/server/static/static-echo-2': { isStatic: true },
         },
+        rootElement: { isStatic: true },
         routeElement: { isStatic: true },
         noSsr: false,
         path: [
@@ -1129,9 +1128,9 @@ describe('createPages pages and layouts', () => {
       },
       {
         elements: {
-          root: { isStatic: true },
           'page:/server/static/static-echo/static-echo-2': { isStatic: true },
         },
+        rootElement: { isStatic: true },
         routeElement: { isStatic: true },
         noSsr: false,
         path: [
@@ -1149,9 +1148,9 @@ describe('createPages pages and layouts', () => {
       },
       {
         elements: {
-          root: { isStatic: true },
           'page:/server/static/hello/hello-2': { isStatic: true },
         },
+        rootElement: { isStatic: true },
         routeElement: { isStatic: true },
         noSsr: false,
         path: [
@@ -1169,9 +1168,9 @@ describe('createPages pages and layouts', () => {
       },
       {
         elements: {
-          root: { isStatic: true },
           'page:/static/wild/bar': { isStatic: true },
         },
+        rootElement: { isStatic: true },
         routeElement: { isStatic: true },
         noSsr: false,
         path: [
@@ -1187,9 +1186,9 @@ describe('createPages pages and layouts', () => {
       },
       {
         elements: {
-          root: { isStatic: true },
           'page:/static/wild/hello/hello-2': { isStatic: true },
         },
+        rootElement: { isStatic: true },
         routeElement: { isStatic: true },
         noSsr: false,
         path: [
@@ -1206,9 +1205,9 @@ describe('createPages pages and layouts', () => {
       },
       {
         elements: {
-          root: { isStatic: true },
           'page:/static/wild/foo/foo-2/foo-3': { isStatic: true },
         },
+        rootElement: { isStatic: true },
         routeElement: { isStatic: true },
         noSsr: false,
         path: [
@@ -1226,9 +1225,9 @@ describe('createPages pages and layouts', () => {
       },
       {
         elements: {
-          root: { isStatic: true },
           'page:/client/dynamic': { isStatic: false },
         },
+        rootElement: { isStatic: true },
         routeElement: { isStatic: true },
         noSsr: false,
         path: [
@@ -1238,9 +1237,9 @@ describe('createPages pages and layouts', () => {
       },
       {
         elements: {
-          root: { isStatic: true },
           'page:/server/one/[echo]': { isStatic: false },
         },
+        rootElement: { isStatic: true },
         routeElement: { isStatic: true },
         noSsr: false,
         path: [
@@ -1251,9 +1250,9 @@ describe('createPages pages and layouts', () => {
       },
       {
         elements: {
-          root: { isStatic: true },
           'page:/server/two/[echo]/[echo2]': { isStatic: false },
         },
+        rootElement: { isStatic: true },
         routeElement: { isStatic: true },
         noSsr: false,
         path: [
@@ -1265,9 +1264,9 @@ describe('createPages pages and layouts', () => {
       },
       {
         elements: {
-          root: { isStatic: true },
           'page:/server/wild/[...wild]': { isStatic: false },
         },
+        rootElement: { isStatic: true },
         routeElement: { isStatic: true },
         noSsr: false,
         path: [
@@ -1278,9 +1277,9 @@ describe('createPages pages and layouts', () => {
       },
       {
         elements: {
-          root: { isStatic: true },
           'page:/server/oneAndWild/[slug]/[...wild]': { isStatic: false },
         },
+        rootElement: { isStatic: true },
         routeElement: { isStatic: true },
         noSsr: false,
         path: [
@@ -1295,9 +1294,9 @@ describe('createPages pages and layouts', () => {
       query: '?skip=[]',
     });
     assert(route);
+    expect(route.rootElement).toBeDefined();
     expect(route.routeElement).toBeDefined();
     expect(Object.keys(route.elements)).toEqual([
-      'root',
       'page:/server/two/[echo]/[echo2]',
     ]);
   });
diff --git a/packages/waku/tests/vite-plugin-rsc-transform-internals.test.ts b/packages/waku/tests/vite-plugin-rsc-transform-internals.test.ts
index 9d8b48a12..e09e994b5 100644
--- a/packages/waku/tests/vite-plugin-rsc-transform-internals.test.ts
+++ b/packages/waku/tests/vite-plugin-rsc-transform-internals.test.ts
@@ -29,6 +29,8 @@ export default function App() {
     const code = `
 'use client';
 
+import { Component } from 'react';
+
 export const Empty = () => null;
 
 function Private() {
@@ -39,6 +41,12 @@ export function Greet({ name }: { name: string }) {
   return <>Hello {name}</>;
 }
 
+export class MyComponent extends Component {
+  render() {
+    return <p>Class Component</p>;
+  }
+}
+
 export default function App() {
   return <div>Hello World</div>;
 }
@@ -52,6 +60,8 @@ export default function App() {
 
         export const Greet = registerClientReference(() => { throw new Error('It is not possible to invoke a client function from the server: /src/App.tsx#Greet'); }, '/src/App.tsx', 'Greet');
 
+        export const MyComponent = registerClientReference(() => { throw new Error('It is not possible to invoke a client function from the server: /src/App.tsx#MyComponent'); }, '/src/App.tsx', 'MyComponent');
+
         export default registerClientReference(() => { throw new Error('It is not possible to invoke a client function from the server: /src/App.tsx#default'); }, '/src/App.tsx', 'default');
         "
       `);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9f628ed35..bdef76d61 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -103,7 +103,7 @@ importers:
         specifier: 19.0.0
         version: 19.0.0(react@19.0.0)
       react-error-boundary:
-        specifier: ^5.0.0
+        specifier: 5.0.0
         version: 5.0.0(react@19.0.0)
       react-server-dom-webpack:
         specifier: 19.0.0
