diff --git a/docs/features/techdocs/how-to-guides.md b/docs/features/techdocs/how-to-guides.md
index 45929dfd20..0c3bc98c09 100644
--- a/docs/features/techdocs/how-to-guides.md
+++ b/docs/features/techdocs/how-to-guides.md
@@ -162,11 +162,11 @@ The `techDocsPage` is a default techdocs reader page which lives in
 having to set anything up.
 
 ```tsx
-<TechDocsReaderPage>
+<Page themeId="documentation">
   <TechDocsReaderPageHeader />
   <TechDocsReaderPageSubheader />
   <TechDocsReaderPageContent />
-</TechDocsReaderPage>
+</Page>
 ```
 
 If you would like to compose your own `techDocsPage`, you can do so by replacing
@@ -174,30 +174,30 @@ the children of TechDocsPage with something else. Maybe you are _just_
 interested in replacing the Header:
 
 ```tsx
-<TechDocsReaderPage>
+<Page themeId="documentation">
   <Header type="documentation" title="Custom Header" />
   <TechDocsReaderPageContent />
-</TechDocsReaderPage>
+</Page>
 ```
 
 Or maybe you want to disable the in-context search
 
 ```tsx
-<TechDocsReaderPage>
+<Page themeId="documentation">
   <Header type="documentation" title="Custom Header" />
   <TechDocsReaderPageContent withSearch={false} />
-</TechDocsReaderPage>
+</Page>
 ```
 
 Or maybe you want to replace the entire TechDocs Page.
 
 ```tsx
-<TechDocsReaderPage>
+<Page themeId="documentation">
   <Header type="documentation" title="Custom Header" />
   <Content data-testid="techdocs-content">
     <p>my own content</p>
   </Content>
-</TechDocsReaderPage>
+</Page>
 ```
 
 ## How to migrate from TechDocs Alpha to Beta
diff --git a/packages/app/src/components/techdocs/TechDocsPage.tsx b/packages/app/src/components/techdocs/TechDocsPage.tsx
index 48a9812160..d79acbe0a7 100644
--- a/packages/app/src/components/techdocs/TechDocsPage.tsx
+++ b/packages/app/src/components/techdocs/TechDocsPage.tsx
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
+import React from 'react';
+import { Page } from '@backstage/core-components';
 import {
-  TechDocsReaderPage,
   TechDocsReaderPageHeader,
   TechDocsReaderPageSubheader,
   TechDocsReaderPageContent,
 } from '@backstage/plugin-techdocs';
-import React from 'react';
 
 const DefaultTechDocsPage = () => {
   return (
-    <TechDocsReaderPage>
+    <Page themeId="documentation">
       <TechDocsReaderPageHeader />
       <TechDocsReaderPageSubheader />
       <TechDocsReaderPageContent />
-    </TechDocsReaderPage>
+    </Page>
   );
 };
 
diff --git a/plugins/techdocs/src/reader/components/TechDocsReaderPage/TechDocsReaderPage.tsx b/plugins/techdocs/src/reader/components/TechDocsReaderPage/TechDocsReaderPage.tsx
index a84c0a8122..6885957002 100644
--- a/plugins/techdocs/src/reader/components/TechDocsReaderPage/TechDocsReaderPage.tsx
+++ b/plugins/techdocs/src/reader/components/TechDocsReaderPage/TechDocsReaderPage.tsx
@@ -97,11 +97,9 @@ export const TechDocsReaderPage = (props: TechDocsReaderPageProps) => {
     });
 
     return (
-      (page as JSX.Element) || (
-        <TechDocsReaderPageProvider entityRef={entityRef}>
-          <TechDocsReaderLayout />
-        </TechDocsReaderPageProvider>
-      )
+      <TechDocsReaderPageProvider entityRef={entityRef}>
+        {(page as JSX.Element) || <TechDocsReaderLayout />}
+      </TechDocsReaderPageProvider>
     );
   }