diff --git a/chain/chainhandle.go b/chain/chainhandle.go
index 724c8ce23..7434ddac0 100644
--- a/chain/chainhandle.go
+++ b/chain/chainhandle.go
@@ -686,7 +686,7 @@ func (e *blockExecutor) execute() error {
 			return err
 		}
 
-		if err := contract.SaveRecoveryPoint(e.BlockState); err != nil {
+		if err := contract.SaveRecoveryPoint(e.BlockState.LuaStateDB); err != nil {
 			return err
 		}
 
diff --git a/contract/statesql.go b/contract/statesql.go
index e2c7849cc..d8a19657b 100644
--- a/contract/statesql.go
+++ b/contract/statesql.go
@@ -16,7 +16,7 @@ import (
 
 	"github.com/aergoio/aergo-lib/log"
 	"github.com/aergoio/aergo/v2/internal/enc/base58"
-	"github.com/aergoio/aergo/v2/state"
+	"github.com/aergoio/aergo/v2/state/statedb"
 	"github.com/aergoio/aergo/v2/types"
 )
 
@@ -126,7 +126,7 @@ func CloseDatabase() {
 	}
 }
 
-func SaveRecoveryPoint(bs *state.BlockState) error {
+func SaveRecoveryPoint(luaState *statedb.StateDB) error {
 	defer CloseDatabase()
 
 	for id, db := range database.DBs {
@@ -145,13 +145,13 @@ func SaveRecoveryPoint(bs *state.BlockState) error {
 				if sqlLgr.IsDebugEnabled() {
 					sqlLgr.Debug().Str("db_name", id).Uint64("commit_id", rp).Msg("save recovery point")
 				}
-				receiverState, err := bs.LuaStateDB.GetAccountState(db.accountID)
+				receiverState, err := luaState.GetAccountState(db.accountID)
 				if err != nil {
 					return err
 				}
 				receiverChange := receiverState.Clone()
 				receiverChange.SqlRecoveryPoint = uint64(rp)
-				err = bs.LuaStateDB.PutState(db.accountID, receiverChange)
+				err = luaState.PutState(db.accountID, receiverChange)
 				if err != nil {
 					return err
 				}
diff --git a/contract/vm_direct/vm_direct.go b/contract/vm_direct/vm_direct.go
index 28dd9290b..3f058c1e8 100644
--- a/contract/vm_direct/vm_direct.go
+++ b/contract/vm_direct/vm_direct.go
@@ -330,7 +330,7 @@ func (e *blockExecutor) execute() error {
 		return err
 	}
 
-	if err := contract.SaveRecoveryPoint(e.BlockState); err != nil {
+	if err := contract.SaveRecoveryPoint(e.BlockState.LuaStateDB); err != nil {
 		return err
 	}
 
diff --git a/contract/vm_dummy/vm_dummy.go b/contract/vm_dummy/vm_dummy.go
index 915a6e957..8b10f994c 100644
--- a/contract/vm_dummy/vm_dummy.go
+++ b/contract/vm_dummy/vm_dummy.go
@@ -637,7 +637,7 @@ func (bc *DummyChain) ConnectBlock(txs ...LuaTxTester) error {
 			return err
 		}
 	}
-	err := contract.SaveRecoveryPoint(blockState)
+	err := contract.SaveRecoveryPoint(blockState.LuaStateDB)
 	if err != nil {
 		return err
 	}