diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index ee7611c6a4..67beac471e 100644
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -1313,7 +1313,7 @@ print_entry(
 	{
 		if (bv.bv_val == NULL) break;
 
-		if ( attrsonly ) {
+		if ( attrsonly || !bvals ) {
 			write_ldif( LDIF_PUT_NOVALUE, bv.bv_val, NULL, 0 );
 
 		} else {