diff --git a/.changeset/dry-games-end.md b/.changeset/dry-games-end.md
new file mode 100644
index 0000000000..dc2f86ee10
--- /dev/null
+++ b/.changeset/dry-games-end.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder': patch
+---
+
+Fix bug with empty strings in `EntityPicker`