diff --git a/servers/slapd/back-bdb/search.c b/servers/slapd/back-bdb/search.c
index f4ee315c1b..6b3447ef5c 100644
--- a/servers/slapd/back-bdb/search.c
+++ b/servers/slapd/back-bdb/search.c
@@ -428,8 +428,14 @@ bdb_search(
 				}
 
 				if (e) {
-					int result = send_search_entry( be, conn, op,
-						e, attrs, attrsonly, NULL);
+					int result;
+					
+					if( op->o_noop ) {
+						result = 0;
+					} else {
+						result = send_search_entry( be, conn, op,
+							e, attrs, attrsonly, NULL);
+					}
 
 					switch (result) {
 					case 0:		/* entry sent ok */