diff --git a/state/domain.go b/state/domain.go
index 3da7c61f2..60596ce56 100644
--- a/state/domain.go
+++ b/state/domain.go
@@ -298,7 +298,7 @@ func NewDomain(cfg domainCfg, aggregationStep uint64, filenameBase, keysTable, v
 		keysTable:   keysTable,
 		valsTable:   valsTable,
 		compression: cfg.compress,
-		files:       btree2.NewBTreeGOptions[*filesItem](filesItemLess, btree2.Options{Degree: 128, NoLocks: false}),
+		files:       btree2.NewBTreeGOptions[*filesItem](filesItemLess, btree2.Options{Degree: 128}),
 		stats:       DomainStats{FilesQueries: &atomic.Uint64{}, TotalQueries: &atomic.Uint64{}},
 
 		domainLargeValues: cfg.domainLargeValues,
diff --git a/state/history.go b/state/history.go
index f647a2aa0..82eef4729 100644
--- a/state/history.go
+++ b/state/history.go
@@ -91,7 +91,7 @@ type histCfg struct {
 
 func NewHistory(cfg histCfg, aggregationStep uint64, filenameBase, indexKeysTable, indexTable, historyValsTable string, integrityFileExtensions []string, logger log.Logger) (*History, error) {
 	h := History{
-		files:                   btree2.NewBTreeGOptions[*filesItem](filesItemLess, btree2.Options{Degree: 128, NoLocks: false}),
+		files:                   btree2.NewBTreeGOptions[*filesItem](filesItemLess, btree2.Options{Degree: 128}),
 		historyValsTable:        historyValsTable,
 		compression:             cfg.compression,
 		compressWorkers:         1,
diff --git a/state/inverted_index.go b/state/inverted_index.go
index df91a0350..1b3ce2fcf 100644
--- a/state/inverted_index.go
+++ b/state/inverted_index.go
@@ -109,7 +109,7 @@ func NewInvertedIndex(
 	ii := InvertedIndex{
 		iiCfg:                   cfg,
 		warmDir:                 filepath.Join(baseDir, "warm"),
-		files:                   btree2.NewBTreeGOptions[*filesItem](filesItemLess, btree2.Options{Degree: 128, NoLocks: false}),
+		files:                   btree2.NewBTreeGOptions[*filesItem](filesItemLess, btree2.Options{Degree: 128}),
 		aggregationStep:         aggregationStep,
 		filenameBase:            filenameBase,
 		indexKeysTable:          indexKeysTable,