diff --git a/servers/slapd/back-ldbm/add.c b/servers/slapd/back-ldbm/add.c
index 8e8316c196..28fdc31e7b 100644
--- a/servers/slapd/back-ldbm/add.c
+++ b/servers/slapd/back-ldbm/add.c
@@ -221,8 +221,6 @@ ldbm_back_add(
 	rc = 0;
 
 return_results:;
-	cache_set_state( &li->li_cache, e, 0 );
-
 	if (p != NULL) {
 		/* free parent and writer lock */
 		cache_return_entry_w( &li->li_cache, p ); 
@@ -233,6 +231,8 @@ return_results:;
 		pthread_mutex_unlock(&li->li_root_mutex);
 	}
 
+	cache_set_state( &li->li_cache, e, 0 );
+
 	/* free entry and writer lock */
 	cache_return_entry_w( &li->li_cache, e );