diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 4f359a8532..2488065c40 100644
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -723,6 +723,9 @@ static void connection_abandon( Connection *c )
 		SlapReply rs = {REP_RESULT};
 
 		next = LDAP_STAILQ_NEXT( o, o_next );
+		/* don't abandon an op twice */
+		if ( o->o_abandon )
+			continue;
 		op.orn_msgid = o->o_msgid;
 		o->o_abandon = 1;
 		op.o_bd = frontendDB;