diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c
index 90abb9f6c7..34c23de511 100644
--- a/servers/slapd/back-meta/search.c
+++ b/servers/slapd/back-meta/search.c
@@ -378,8 +378,7 @@ really_bad:;
 				goto finish;
 
 			} else if ( rc == LDAP_RES_SEARCH_ENTRY ) {
-				if ( op->ors_slimit > 0 && rs->sr_nentries == op->ors_slimit )
-				{
+				if ( --op->ors_slimit == -1 ) {
 					ldap_msgfree( res );
 					res = NULL;