diff --git a/servers/slapd/back-bdb/config.c b/servers/slapd/back-bdb/config.c
index 91dcad1074..be86835e4d 100644
--- a/servers/slapd/back-bdb/config.c
+++ b/servers/slapd/back-bdb/config.c
@@ -186,6 +186,9 @@ bdb_online_index( void *ctx, void *arg )
 	data.dlen = data.ulen = 0;
 
 	while ( 1 ) {
+		if ( slapd_shutdown )
+			break;
+
 		rc = TXN_BEGIN( bdb->bi_dbenv, NULL, &txn, bdb->bi_db_opflags );
 		if ( rc ) 
 			break;