diff --git a/.changeset/pretty-seas-hug.md b/.changeset/pretty-seas-hug.md
new file mode 100644
index 0000000000..e512e1e234
--- /dev/null
+++ b/.changeset/pretty-seas-hug.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-react': patch
+---
+
+Add filter handling for user and group types to fix EntityOwnerPicker for users/groups