diff --git a/servers/slapd/back-mdb/search.c b/servers/slapd/back-mdb/search.c
index 502312add2..bb3445b8aa 100644
--- a/servers/slapd/back-mdb/search.c
+++ b/servers/slapd/back-mdb/search.c
@@ -1120,7 +1120,7 @@ notfound:
 		}
 
 loop_continue:
-		if ( !wwctx.flag && mdb->mi_rtxn_size ) {
+		if ( moi == &opinfo && !wwctx.flag && mdb->mi_rtxn_size ) {
 			wwctx.nentries++;
 			if ( wwctx.nentries >= mdb->mi_rtxn_size ) {
 				wwctx.nentries = 0;