From 0f5c6b6e4c76f3a63f5a107025323adbadd84e81 Mon Sep 17 00:00:00 2001
From: Manuel Schiller <manuel.schiller@caligano.de>
Date: Sat, 20 Sep 2025 01:16:58 +0200
Subject: [PATCH] fix: tell router that rendering finished when rendering to
 string

fixes #5155
---
 packages/react-router/src/ssr/renderRouterToString.tsx | 1 +
 packages/solid-router/src/ssr/renderRouterToString.tsx | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/react-router/src/ssr/renderRouterToString.tsx b/packages/react-router/src/ssr/renderRouterToString.tsx
index eb3bf5dfd8b..b75e88e78e8 100644
--- a/packages/react-router/src/ssr/renderRouterToString.tsx
+++ b/packages/react-router/src/ssr/renderRouterToString.tsx
@@ -13,6 +13,7 @@ export const renderRouterToString = async ({
 }) => {
   try {
     let html = ReactDOMServer.renderToString(children)
+    router.serverSsr!.setRenderFinished()
     const injectedHtml = await Promise.all(router.serverSsr!.injectedHtml).then(
       (htmls) => htmls.join(''),
     )
diff --git a/packages/solid-router/src/ssr/renderRouterToString.tsx b/packages/solid-router/src/ssr/renderRouterToString.tsx
index 1512d9d64fa..dd3e584a965 100644
--- a/packages/solid-router/src/ssr/renderRouterToString.tsx
+++ b/packages/solid-router/src/ssr/renderRouterToString.tsx
@@ -13,6 +13,7 @@ export const renderRouterToString = async ({
 }) => {
   try {
     let html = Solid.renderToString(children)
+    router.serverSsr!.setRenderFinished()
     const injectedHtml = await Promise.all(router.serverSsr!.injectedHtml).then(
       (htmls) => htmls.join(''),
     )