diff --git a/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx b/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
index a667246287..8c71df67b6 100644
--- a/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
+++ b/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
@@ -193,8 +193,6 @@ export const MultistepJsonForm = (props: Props) => {
     <>
       <Stepper activeStep={activeStep} orientation="vertical">
         {steps.map(({ title, schema, ...formProps }, index) => {
-          const schemaProps = transformSchemaToProps(schema, layouts);
-
           return (
             <StepUI key={title}>
               <StepLabel
@@ -219,7 +217,7 @@ export const MultistepJsonForm = (props: Props) => {
                     if (e.errors.length === 0) handleNext();
                   }}
                   {...formProps}
-                  {...schemaProps}
+                  {...transformSchemaToProps(schema, layouts)}
                 >
                   <Button disabled={activeStep === 0} onClick={handleBack}>
                     Back
diff --git a/plugins/scaffolder/src/components/MultistepJsonForm/schema.ts b/plugins/scaffolder/src/components/MultistepJsonForm/schema.ts
index 10bdbcf320..5d74b0fc81 100644
--- a/plugins/scaffolder/src/components/MultistepJsonForm/schema.ts
+++ b/plugins/scaffolder/src/components/MultistepJsonForm/schema.ts
@@ -102,7 +102,7 @@ function extractUiSchema(schema: JsonObject, uiSchema: JsonObject) {
 
 export function transformSchemaToProps(
   inputSchema: JsonObject,
-  layouts: LayoutOptions[],
+  layouts: LayoutOptions[] = [],
 ): {
   schema: FormProps<any>['schema'];
   uiSchema: FormProps<any>['uiSchema'];
diff --git a/plugins/scaffolder/src/components/Router.tsx b/plugins/scaffolder/src/components/Router.tsx
index 12355035cc..021d73f5e9 100644
--- a/plugins/scaffolder/src/components/Router.tsx
+++ b/plugins/scaffolder/src/components/Router.tsx
@@ -118,7 +118,7 @@ export const Router = (props: RouterProps) => {
   );
 
   /**
-   * This component can be deleted once the older routes havest been deprecated.
+   * This component can be deleted once the older routes have been deprecated.
    */
   const RedirectingComponent = () => {
     const { templateName } = useRouteRefParams(legacySelectedTemplateRouteRef);