diff --git a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx
index 74582d0762..4462c333b1 100644
--- a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx
+++ b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx
@@ -156,21 +156,24 @@ export const ScaffolderPageContents = () => {
             <ResultsFilter availableCategories={availableCategories} />
           </div>
           <div>
-            {!matchingEntities && loading && <Progress />}
-            {matchingEntities && !matchingEntities.length && (
-              <Typography variant="body2">
-                Shoot! Looks like you don't have any templates. Check out the
-                documentation{' '}
-                <Link href="https://backstage.io/docs/features/software-templates/adding-templates">
-                  here!
-                </Link>
-              </Typography>
-            )}
+
+            {loading && <Progress />}
+
             {error && (
               <WarningPanel title="Oops! Something went wrong loading the templates">
                 {error.message}
               </WarningPanel>
             )}
+
+            {!error && !loading && matchingEntities && !matchingEntities.length && (
+              <Typography variant="body2">
+                No templates found that match your filter. Learn more about{' '}
+                <Link href="https://backstage.io/docs/features/software-templates/adding-templates">
+                  adding templates
+                </Link>.
+              </Typography>
+            )}
+
             <Grid container>
               {matchingEntities &&
                 matchingEntities?.length > 0 &&