diff --git a/servers/slapd/back-mdb/attr.c b/servers/slapd/back-mdb/attr.c
index 3ee0a4890e..87c634f1e3 100644
--- a/servers/slapd/back-mdb/attr.c
+++ b/servers/slapd/back-mdb/attr.c
@@ -98,6 +98,9 @@ mdb_attr_dbs_open(
 	int i, flags;
 	int rc;
 
+	if ( !mdb->mi_nattrs )
+		return 0;
+
 	txn = tx0;
 	if ( txn == NULL ) {
 		rc = mdb_txn_begin( mdb->mi_dbenv, NULL, 0, &txn );
diff --git a/servers/slapd/back-mdb/config.c b/servers/slapd/back-mdb/config.c
index 0f86f76436..4b88c36952 100644
--- a/servers/slapd/back-mdb/config.c
+++ b/servers/slapd/back-mdb/config.c
@@ -371,6 +371,9 @@ mdb_setup_indexer( struct mdb_info *mdb )
 	int i, rc, changed = 0;
 	unsigned short s;
 
+	if ( !mdb->mi_nattrs )
+		return 0;
+
 	rc = mdb_txn_begin( mdb->mi_dbenv, NULL, 0, &txn );
 	if ( rc )
 		return rc;