diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c
index ae6da9dc58..60f68f0aa5 100644
--- a/servers/slapd/back-meta/search.c
+++ b/servers/slapd/back-meta/search.c
@@ -701,7 +701,9 @@ really_bad:;
 					 * the target enforced a limit lower
 					 * than what requested by the proxy;
 					 * ignore it */
-					if ( rs->sr_nentries == op->ors_slimit ) {
+					if ( rs->sr_nentries == op->ors_slimit
+						|| META_BACK_ONERR_STOP( mi ) )
+					{
 						savepriv = op->o_private;
 						op->o_private = (void *)i;
 						send_ldap_result( op, rs );