diff --git a/app/store.go b/app/store.go
index 84092e5db..1f4442004 100644
--- a/app/store.go
+++ b/app/store.go
@@ -60,7 +60,7 @@ func NewStore(dbName string, cacheSize int, logger log.Logger) (*Store, error) {
 			dbm.NewMemDB(),
 		)
 		store := &Store{
-			State:  state.NewState(tree, true),
+			State:  state.NewState(tree),
 			height: initialHeight,
 			logger: logger,
 		}
@@ -108,7 +108,7 @@ func NewStore(dbName string, cacheSize int, logger log.Logger) (*Store, error) {
 	}
 
 	res := &Store{
-		State:     state.NewState(tree, true),
+		State:     state.NewState(tree),
 		height:    chainState.Height,
 		hash:      chainState.Hash,
 		persisted: true,
diff --git a/state/merkle.go b/state/merkle.go
index 2add7d2fd..a097b9431 100644
--- a/state/merkle.go
+++ b/state/merkle.go
@@ -11,13 +11,13 @@ type State struct {
 	persistent bool
 }
 
-func NewState(tree *iavl.VersionedTree, persistent bool) State {
+func NewState(tree *iavl.VersionedTree) State {
 	base := NewBonsai(tree)
 	return State{
 		committed:  base,
 		deliverTx:  base.Checkpoint(),
 		checkTx:    base.Checkpoint(),
-		persistent: persistent,
+		persistent: true,
 	}
 }
 
diff --git a/state/merkle_test.go b/state/merkle_test.go
index fa039956d..9866195b4 100644
--- a/state/merkle_test.go
+++ b/state/merkle_test.go
@@ -66,7 +66,7 @@ func TestStateCommitHash(t *testing.T) {
 
 			// make the store...
 			tree := iavl.NewVersionedTree(0, db.NewMemDB())
-			store := NewState(tree, false)
+			store := NewState(tree)
 
 			for n, r := range tc.rounds {
 				// start the cache
@@ -77,7 +77,7 @@ func TestStateCommitHash(t *testing.T) {
 					deliver.Set(k, v)
 				}
 				// commit and add hash to result
-				hash, err := store.Commit()
+				hash, err := store.Commit(uint64(n + 1))
 				require.Nil(err, "tc:%d / rnd:%d - %+v", i, n, err)
 				result[n] = hash
 			}