diff --git a/servers/slapd/overlays/glue.c b/servers/slapd/overlays/glue.c
index a09176e5c7..b5e53f13c8 100644
--- a/servers/slapd/overlays/glue.c
+++ b/servers/slapd/overlays/glue.c
@@ -396,7 +396,9 @@ end_of_loop:;
 
 		break;
 	}
-	if ( !op->o_abandon ) {
+	if ( op->o_abandon ) {
+		rs->sr_err = SLAPD_ABANDON;
+	} else {
 		op->o_callback = cb.sc_next;
 		rs->sr_err = gs.err;
 		rs->sr_matched = gs.matched;