diff --git a/CHANGES b/CHANGES
index 8185e2655cb3f9e25d838b229ad93ccd73eaa717..74a00101fbbec4c5023660f7da72f3e43f12a0e4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -20,6 +20,7 @@ OpenLDAP 2.4.22 Engineering
 	Fixed slapo-collect REP_ENTRY flag handling (ITS#5340,ITS#6423)
 	Fixed slapo-dds with NULL backend (ITS#6490)
 	Fixed slapo-dynlist REP_ENTRY flag handling (ITS#5340,ITS#6423)
+	Fixed slapo-memberof attr count (ITS#6508)
 	Fixed slapo-pcache to release its own entries (ITS#6484)
 	Fixed slapo-pcache with NULL backend (ITS#6490)
 	Fixed slapo-rwm entry release handling (ITS#6484)
diff --git a/servers/slapd/overlays/memberof.c b/servers/slapd/overlays/memberof.c
index 3a38b6337336caf4a69710f329c90b5aca1490ac..88637b200fd40d5f11ddba6cbebc544c80ed7d74 100644
--- a/servers/slapd/overlays/memberof.c
+++ b/servers/slapd/overlays/memberof.c
@@ -580,6 +580,7 @@ memberof_op_add( Operation *op, SlapReply *rs )
 							sizeof( struct berval ) * ( j - i ) );
 					}
 					i--;
+					a->a_numvals--;
 				}
 			}