diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c
index 84ae197ede..cbc6abd83e 100644
--- a/servers/slapd/bind.c
+++ b/servers/slapd/bind.c
@@ -594,6 +594,7 @@ fe_op_bind( Operation *op, SlapReply *rs )
 
 		} else if ( !BER_BVISNULL( &op->orb_edn ) ) {
 			free( op->orb_edn.bv_val );
+			BER_BVZERO( &op->orb_edn );
 		}
 
 	} else {