diff --git a/packages/next/server/render.tsx b/packages/next/server/render.tsx
index d1b06c7deb2f..beafbfd6b75b 100644
--- a/packages/next/server/render.tsx
+++ b/packages/next/server/render.tsx
@@ -661,7 +661,11 @@ export async function renderToHTML(
     locales: renderOpts.locales,
     defaultLocale: renderOpts.defaultLocale,
     AppTree: (props: any) => {
-      return renderApp(App, Component, router, props, isServerComponent)
+      return (
+        <AppContainerWithIsomorphicFiberStructure>
+          {renderApp(App, Component, router, props, isServerComponent)}
+        </AppContainerWithIsomorphicFiberStructure>
+      )
     },
     defaultGetInitialProps: async (
       docCtx: DocumentContext,