diff --git a/changelog/unreleased/fix-ldap-invalid-users-groups.md b/changelog/unreleased/fix-ldap-invalid-users-groups.md
new file mode 100644
index 00000000000..9f0db8640a8
--- /dev/null
+++ b/changelog/unreleased/fix-ldap-invalid-users-groups.md
@@ -0,0 +1,6 @@
+Bugfix: Fix handling of invalid LDAP users and groups
+
+We fixed an issue where ocis would exit with a panic when LDAP users
+or groups where missing required attributes (e.g. the id)
+
+https://github.com/owncloud/ocis/issues/4274