diff --git a/CHANGELOG.md b/CHANGELOG.md
index bef3911d07..6562113d58 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ The following sections list the changes for unreleased.
 
 ## Summary
 
+* Bugfix - Fix handling of invalid LDAP users and groups: [#4274](https://github.com/owncloud/ocis/issues/4274)
 * Bugfix - Fix search in received shares: [#4308](https://github.com/owncloud/ocis/issues/4308)
 * Bugfix - Substring search for sharees: [#547](https://github.com/owncloud/ocis/issues/547)
 * Bugfix - Space Creators can hand over spaces: [#4244](https://github.com/owncloud/ocis/pull/4244)
@@ -19,6 +20,13 @@ The following sections list the changes for unreleased.
 
 ## Details
 
+* Bugfix - Fix handling of invalid LDAP users and groups: [#4274](https://github.com/owncloud/ocis/issues/4274)
+
+   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
+
 * Bugfix - Fix search in received shares: [#4308](https://github.com/owncloud/ocis/issues/4308)
 
    We fixed a problem where items in received shares were not found.