diff --git a/plugins/scaffolder/src/components/ScaffolderPage/index.tsx b/plugins/scaffolder/src/components/ScaffolderPage/index.tsx
index aa2a8b639a..2f9774757b 100644
--- a/plugins/scaffolder/src/components/ScaffolderPage/index.tsx
+++ b/plugins/scaffolder/src/components/ScaffolderPage/index.tsx
@@ -90,7 +90,7 @@ const ScaffolderPage: React.FC<{}> = () => {
           </Link>
           .
         </Typography>
-        {isValidating && <LinearProgress />}
+        {!templates && isValidating && <LinearProgress />}
         <Grid container>
           {templates &&
             templates.map(template => {
@@ -103,7 +103,7 @@ const ScaffolderPage: React.FC<{}> = () => {
                     }`}
                     type={template.spec.type ?? ''}
                     description={template.metadata.description ?? '-'}
-                    tags={template.metadata?.tags ?? []}
+                    tags={(template.metadata?.tags as string[]) ?? []}
                   />
                 </Grid>
               );