diff --git a/node_core/src/lib.rs b/node_core/src/lib.rs
index ca412c4..c143f59 100644
--- a/node_core/src/lib.rs
+++ b/node_core/src/lib.rs
@@ -98,12 +98,10 @@ impl NodeCore {
 
         let genesis_block = client.get_block(genesis_id.genesis_id).await?.block;
 
-        let mut storage = NodeChainStore::new_with_genesis(&config.home, genesis_block);
+        let (mut storage, mut chain_height) = NodeChainStore::new(&config.home, genesis_block)?;
 
         pre_start::setup_empty_sc_states(&storage).await?;
 
-        let mut chain_height = genesis_id.genesis_id;
-
         //Chain update loop
         loop {
             let next_block = chain_height + 1;