diff --git a/servers/slapd/back-mdb/id2entry.c b/servers/slapd/back-mdb/id2entry.c
index ffb8b3f1eb..23bf0411b7 100644
--- a/servers/slapd/back-mdb/id2entry.c
+++ b/servers/slapd/back-mdb/id2entry.c
@@ -744,8 +744,10 @@ mdb_opinfo_get( Operation *op, struct mdb_info *mdb, int rdonly, mdb_op_info **m
 				moi->moi_txn = mdb_tool_txn;
 			} else {
 				int flag = 0;
+#ifdef SLAP_CONTROL_X_LAZY_COMMIT
 				if ( get_lazyCommit( op ))
 					flag |= MDB_NOMETASYNC;
+#endif
 				rc = mdb_txn_begin( mdb->mi_dbenv, NULL, flag, &moi->moi_txn );
 				if (rc) {
 					Debug( LDAP_DEBUG_ANY, "mdb_opinfo_get: err %s(%d)\n",
diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index a573b6ff3e..8c0be8eedd 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -3815,8 +3815,10 @@ syncrepl_entry(
 		slap_queue_csn( op, syncCSN );
 	}
 
+#ifdef SLAP_CONTROL_X_LAZY_COMMIT
 	if ( !si->si_refreshDone && si->si_lazyCommit )
 		op->o_lazyCommit = SLAP_CONTROL_NONCRITICAL;
+#endif
 
 	slap_op_time( &op->o_time, &op->o_tincr );
 	switch ( syncstate ) {