diff --git a/packages/next/server/render.tsx b/packages/next/server/render.tsx
index b41e52f36539..f201a94c25ac 100644
--- a/packages/next/server/render.tsx
+++ b/packages/next/server/render.tsx
@@ -197,17 +197,21 @@ function enhanceComponents(
 
 function renderFlight(AppMod: any, ComponentMod: any, props: any) {
   const isServerComponent = !!ComponentMod.__next_rsc__
+  const isServerApp = !!AppMod.__next_rsc__
   const App = interopDefault(AppMod)
   const Component = interopDefault(ComponentMod)
   const AppServer = isServerComponent
     ? (App as React.ComponentType)
     : React.Fragment
 
-  return (
-    <AppServer>
-      <Component {...props} />
-    </AppServer>
-  )
+  if (isServerApp) {
+    return (
+      <AppServer>
+        <Component {...props} />
+      </AppServer>
+    )
+  }
+  return <App Component={Component} {...props} />
 }
 
 export type RenderOptsPartial = {