diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 64894df73a..0cf122727f 100644
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -4313,6 +4313,8 @@ ok:
 				rc = ca->bi->bi_db_open( ca->be, &ca->reply );
 				ca->be->bd_info = bi_orig;
 			}
+		} else if ( ca->cleanup ) {
+			rc = ca->cleanup( ca );
 		}
 		if ( rc ) {
 			if (ca->cr_msg[0] == '\0')