diff --git a/plugins/scaffolder/src/components/CreatePage/CreatePage.tsx b/plugins/scaffolder/src/components/CreatePage/CreatePage.tsx
index 6c69ce975b..458389202d 100644
--- a/plugins/scaffolder/src/components/CreatePage/CreatePage.tsx
+++ b/plugins/scaffolder/src/components/CreatePage/CreatePage.tsx
@@ -59,9 +59,6 @@ export const CreatePage = () => {
   const [jobId, setJobId] = useState<string | null>(null);
   const handleClose = () => setJobId(null);
 
-  if (!template && isValidating) return <LinearProgress />;
-  if (!template || !template?.spec?.schema) return null;
-
   const handleCreate = async () => {
     const job = await scaffolderApi.scaffold(template, formState);
     setJobId(job);
@@ -71,7 +68,6 @@ export const CreatePage = () => {
     null,
   );
   const handleCreateComplete = async (job: Job) => {
-    console.log('DEBUG:', { job });
     const {
       entities: [createdEntity],
     } = await catalogApi.addLocation(
@@ -83,6 +79,10 @@ export const CreatePage = () => {
     );
     setEntity(createdEntity);
   };
+
+  if (!template && isValidating) return <LinearProgress />;
+  if (!template || !template?.spec?.schema) return null;
+
   return (
     <Page>
       <Header