diff --git a/packages/techdocs-cli-embedded-app/package.json b/packages/techdocs-cli-embedded-app/package.json
index c7c65ad55f..d985066ef8 100644
--- a/packages/techdocs-cli-embedded-app/package.json
+++ b/packages/techdocs-cli-embedded-app/package.json
@@ -66,4 +66,4 @@
       "last 1 safari version"
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/packages/techdocs-cli-embedded-app/src/components/TechDocsPage/TechDocsPage.tsx b/packages/techdocs-cli-embedded-app/src/components/TechDocsPage/TechDocsPage.tsx
index 8c44336d73..f160faab0b 100644
--- a/packages/techdocs-cli-embedded-app/src/components/TechDocsPage/TechDocsPage.tsx
+++ b/packages/techdocs-cli-embedded-app/src/components/TechDocsPage/TechDocsPage.tsx
@@ -64,7 +64,7 @@ type TechDocsThemeValue = {
 
 const TechDocsThemeContext = createContext<TechDocsThemeValue>({
   theme: Themes.LIGHT,
-  toggleTheme: () => {},
+  toggleTheme: () => { },
 });
 
 const TechdocsThemeProvider: FC = ({ children }) => {
@@ -120,11 +120,13 @@ export const TechDocsThemeToggle = () => {
   );
 };
 
-export const techDocsPage = (
-  <TechDocsReaderPage>
-    <TechdocsThemeProvider>
+const DefaultTechDocsPage = () => {
+  return <TechdocsThemeProvider>
+    <TechDocsReaderPage>
       <TechDocsReaderPageHeader />
       <TechDocsReaderPageContent withSearch={false} />
-    </TechdocsThemeProvider>
-  </TechDocsReaderPage>
-);
+    </TechDocsReaderPage>
+  </TechdocsThemeProvider>
+}
+
+export const techDocsPage = <DefaultTechDocsPage />
diff --git a/plugins/techdocs/src/reader/components/TechDocsReaderPage/TechDocsReaderPage.tsx b/plugins/techdocs/src/reader/components/TechDocsReaderPage/TechDocsReaderPage.tsx
index fd80ae3af6..df65609ecc 100644
--- a/plugins/techdocs/src/reader/components/TechDocsReaderPage/TechDocsReaderPage.tsx
+++ b/plugins/techdocs/src/reader/components/TechDocsReaderPage/TechDocsReaderPage.tsx
@@ -83,16 +83,17 @@ export type TechDocsReaderPageProps = {
  */
 export const TechDocsReaderPage = ({
   entityRef,
-  children,
+  children
 }: TechDocsReaderPageProps) => {
   const { kind, name, namespace } = useParams();
-  const route = useOutlet() || { props: { children: [] } };
+
+  const outlet = useOutlet()
   const entityName = entityRef ?? { kind, name, namespace };
 
   if (!children) {
-    const outlet = Children.toArray(route.props.children);
+    const childrenList = outlet ? Children.toArray(outlet.props.children) : [];
 
-    const page = outlet.find(child => {
+    const page = childrenList.find(child => {
       const { type } = child as Extension;
       return !type?.__backstage_data?.map?.get(TECHDOCS_ADDONS_WRAPPER_KEY);
     });