diff --git a/.changeset/shy-numbers-try.md b/.changeset/shy-numbers-try.md
new file mode 100644
index 0000000000..a0af1bf12b
--- /dev/null
+++ b/.changeset/shy-numbers-try.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-react': minor
+---
+
+`scaffolder/next`: Don't render `TemplateGroups` when there's no results in with search query