diff --git a/accounts/pkg/service/v0/index.go b/accounts/pkg/service/v0/index.go
index 2af8e27b83..a2c863baa1 100644
--- a/accounts/pkg/service/v0/index.go
+++ b/accounts/pkg/service/v0/index.go
@@ -63,11 +63,11 @@ func recreateContainers(idx *indexer.Indexer, cfg *config.Config) error {
 	}
 
 	// Groups
-	if err := idx.AddIndex(&proto.Group{}, "OnPremisesSamAccountName", "Id", "groups", "unique", nil, true); err != nil {
+	if err := idx.AddIndex(&proto.Group{}, "OnPremisesSamAccountName", "Id", "groups", "unique", nil, false); err != nil {
 		return err
 	}
 
-	if err := idx.AddIndex(&proto.Group{}, "DisplayName", "Id", "groups", "non_unique", nil, true); err != nil {
+	if err := idx.AddIndex(&proto.Group{}, "DisplayName", "Id", "groups", "non_unique", nil, false); err != nil {
 		return err
 	}
 
diff --git a/changelog/unreleased/fix-groups-index.md b/changelog/unreleased/fix-groups-index.md
new file mode 100644
index 0000000000..6e82a1660d
--- /dev/null
+++ b/changelog/unreleased/fix-groups-index.md
@@ -0,0 +1,5 @@
+Bugfix: Change the groups index to be case sensitive 
+
+Groups are considered to be case sensitive. The index must handle them case sensitive too otherwise we will have undeterministic behavior while editing or deleting groups.
+
+https://github.com/owncloud/ocis/pull/2109