diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index d0b065b5f3..60232de30a 100644
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -596,6 +596,9 @@ ldap_send_entry(
 
 next_attr:;
 
+#ifdef SLAP_NVALUES
+		attr->a_nvals = attr->a_vals;
+#endif
 		*attrp = attr;
 		attrp = &attr->a_next;
 	}