diff --git a/servers/slapd/back-bdb/id2entry.c b/servers/slapd/back-bdb/id2entry.c
index e2db8cd065..4bd67d135a 100644
--- a/servers/slapd/back-bdb/id2entry.c
+++ b/servers/slapd/back-bdb/id2entry.c
@@ -170,5 +170,8 @@ int bdb_entry_release(
 	Entry *e,
 	int rw )
 {
-	return bdb_entry_return( be, e );
+	if (o && o->o_tag == LDAP_REQ_ADD)
+		entry_free(e);
+	else
+		return bdb_entry_return( be, e );
 }