diff --git a/plugins/scaffolder/api-report.md b/plugins/scaffolder/api-report.md
index befafc766b..7f29d11073 100644
--- a/plugins/scaffolder/api-report.md
+++ b/plugins/scaffolder/api-report.md
@@ -21,10 +21,8 @@ import { FieldValidation } from '@rjsf/core';
 import { IconButton } from '@material-ui/core';
 import { JsonObject } from '@backstage/types';
 import { JSONSchema } from '@backstage/catalog-model';
-import { JSXElementConstructor } from 'react';
 import { Observable } from '@backstage/types';
 import { default as React_2 } from 'react';
-import { ReactElement } from 'react';
 import { ReactNode } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 import { ScmIntegrationRegistry } from '@backstage/integration';
@@ -255,9 +253,7 @@ export const ScaffolderPage: ({
         template: TemplateEntityV1beta2;
       }>
     | undefined;
-  TaskPageComponent?:
-    | ReactElement<any, string | JSXElementConstructor<any>>
-    | undefined;
+  TaskPageComponent?: ComponentType<{}> | undefined;
   groups?:
     | {
         title?: string | undefined;
diff --git a/plugins/scaffolder/src/components/Router.tsx b/plugins/scaffolder/src/components/Router.tsx
index 17a1606bc9..f41ee853f8 100644
--- a/plugins/scaffolder/src/components/Router.tsx
+++ b/plugins/scaffolder/src/components/Router.tsx
@@ -34,7 +34,7 @@ type RouterProps = {
   TemplateCardComponent?:
     | ComponentType<{ template: TemplateEntityV1beta2 }>
     | undefined;
-  TaskPageComponent?: React.ReactElement | undefined;
+  TaskPageComponent?: ComponentType<{}> | undefined;
   groups?: Array<{
     title?: string;
     titleComponent?: React.ReactNode;
@@ -48,7 +48,7 @@ export const Router = ({
   groups,
 }: RouterProps) => {
   const outlet = useOutlet();
-  const TaskPageElement = TaskPageComponent || <TaskPage />;
+  const TaskPageElement = TaskPageComponent || TaskPage;
 
   const customFieldExtensions = useElementFilter(outlet, elements =>
     elements
@@ -85,7 +85,7 @@ export const Router = ({
         path="/templates/:templateName"
         element={<TemplatePage customFieldExtensions={fieldExtensions} />}
       />
-      <Route path="/tasks/:taskId" element={TaskPageElement} />
+      <Route path="/tasks/:taskId" element={<TaskPageElement />} />
       <Route path="/actions" element={<ActionsPage />} />
     </Routes>
   );