diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index eff5f56429..1d84d0c7ea 100644
--- a/servers/slapd/operation.c
+++ b/servers/slapd/operation.c
@@ -79,6 +79,9 @@ slap_op_free( Operation *op, void *ctx )
 
 	assert( LDAP_STAILQ_NEXT(op, o_next) == NULL );
 
+	/* paranoia */
+	op->o_abandon = 1;
+
 	if ( op->o_ber != NULL ) {
 		ber_free( op->o_ber, 1 );
 	}