diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx
index 87984bece0..109ae7922e 100644
--- a/packages/app/src/App.tsx
+++ b/packages/app/src/App.tsx
@@ -84,6 +84,8 @@ import { searchPage } from './components/search/SearchPage';
 import { providers } from './identityProviders';
 import * as plugins from './plugins';
 
+import { techDocsPage } from './components/techdocs/TechDocsPage';
+
 const app = createApp({
   apis,
   plugins: Object.values(plugins),
@@ -170,7 +172,9 @@ const routes = (
     <Route
       path="/docs/:namespace/:kind/:name/*"
       element={<TechDocsReaderPage />}
-    />
+    >
+      {techDocsPage}
+    </Route>
     <Route path="/create" element={<ScaffolderPage />}>
       <ScaffolderFieldExtensions>
         <LowerCaseValuePickerFieldExtension />
diff --git a/packages/app/src/components/techdocs/TechDocsPage.tsx b/packages/app/src/components/techdocs/TechDocsPage.tsx
new file mode 100644
index 0000000000..ce97d4a38e
--- /dev/null
+++ b/packages/app/src/components/techdocs/TechDocsPage.tsx
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Content } from '@backstage/core-components';
+import {
+  TechDocsPageHeader,
+  TechDocsPage,
+  Reader,
+} from '@backstage/plugin-techdocs';
+import React from 'react';
+
+const DefaultTechDocsPage = () => {
+  return (
+    <TechDocsPage>
+      {({ techdocsMetadataValue, entityMetadataValue, entityId, onReady }) => (
+        <>
+          <TechDocsPageHeader
+            techDocsMetadata={techdocsMetadataValue}
+            entityMetadata={entityMetadataValue}
+            entityId={entityId}
+          />
+          <Content data-testid="techdocs-content">
+            <Reader onReady={onReady} entityId={entityId} />
+          </Content>
+        </>
+      )}
+    </TechDocsPage>
+  );
+};
+
+export const techDocsPage = <DefaultTechDocsPage />;