diff --git a/crates/blockchain-tree/src/blockchain_tree.rs b/crates/blockchain-tree/src/blockchain_tree.rs
index 291d316d7..5079eee5a 100644
--- a/crates/blockchain-tree/src/blockchain_tree.rs
+++ b/crates/blockchain-tree/src/blockchain_tree.rs
@@ -6,7 +6,7 @@ use crate::{
     state::{BlockChainId, TreeState},
     AppendableChain, BlockIndices, BlockchainTreeConfig, BundleStateData, TreeExternals,
 };
-use reth_db::{cursor::DbCursorRO, database::Database, tables, transaction::DbTx};
+use reth_db::database::Database;
 use reth_interfaces::{
     blockchain_tree::{
         error::{BlockchainTreeError, CanonicalError, InsertBlockError, InsertBlockErrorKind},
@@ -99,30 +99,27 @@ impl<DB: Database, EF: ExecutorFactory> BlockchainTree<DB, EF> {
         config: BlockchainTreeConfig,
         prune_modes: Option<PruneModes>,
     ) -> RethResult<Self> {
-        let max_reorg_depth = config.max_reorg_depth();
+        let max_reorg_depth = config.max_reorg_depth() as usize;
         // The size of the broadcast is twice the maximum reorg depth, because at maximum reorg
         // depth at least N blocks must be sent at once.
         let (canon_state_notification_sender, _receiver) =
-            tokio::sync::broadcast::channel(max_reorg_depth as usize * 2);
+            tokio::sync::broadcast::channel(max_reorg_depth * 2);
 
-        let last_canonical_hashes = externals
-            .db
-            .tx()?
-            .cursor_read::<tables::CanonicalHeaders>()?
-            .walk_back(None)?
-            .take(config.num_of_canonical_hashes() as usize)
-            .collect::<Result<Vec<(BlockNumber, BlockHash)>, _>>()?;
+        let last_canonical_hashes =
+            externals.fetch_latest_canonical_hashes(config.num_of_canonical_hashes() as usize)?;
 
         // TODO(rakita) save last finalized block inside database but for now just take
         // tip-max_reorg_depth
         // task: https://github.com/paradigmxyz/reth/issues/1712
-        let (last_finalized_block_number, _) =
-            if last_canonical_hashes.len() > max_reorg_depth as usize {
-                last_canonical_hashes[max_reorg_depth as usize]
-            } else {
-                // it is in reverse order from tip to N
-                last_canonical_hashes.last().cloned().unwrap_or_default()
-            };
+        let last_finalized_block_number = if last_canonical_hashes.len() > max_reorg_depth {
+            // we pick `Highest - max_reorg_depth` block as last finalized block.
+            last_canonical_hashes.keys().nth_back(max_reorg_depth)
+        } else {
+            // we pick the lowest block as last finalized block.
+            last_canonical_hashes.keys().next()
+        }
+        .copied()
+        .unwrap_or_default();
 
         Ok(Self {
             externals,
@@ -743,12 +740,7 @@ impl<DB: Database, EF: ExecutorFactory> BlockchainTree<DB, EF> {
 
         let last_canonical_hashes = self
             .externals
-            .db
-            .tx()?
-            .cursor_read::<tables::CanonicalHeaders>()?
-            .walk_back(None)?
-            .take(self.config.num_of_canonical_hashes() as usize)
-            .collect::<Result<BTreeMap<BlockNumber, BlockHash>, _>>()?;
+            .fetch_latest_canonical_hashes(self.config.num_of_canonical_hashes() as usize)?;
 
         let (mut remove_chains, _) =
             self.block_indices_mut().update_block_hashes(last_canonical_hashes.clone());
@@ -773,13 +765,7 @@ impl<DB: Database, EF: ExecutorFactory> BlockchainTree<DB, EF> {
     pub fn connect_buffered_blocks_to_canonical_hashes(&mut self) -> RethResult<()> {
         let last_canonical_hashes = self
             .externals
-            .db
-            .tx()?
-            .cursor_read::<tables::CanonicalHeaders>()?
-            .walk_back(None)?
-            .take(self.config.num_of_canonical_hashes() as usize)
-            .collect::<Result<BTreeMap<BlockNumber, BlockHash>, _>>()?;
-
+            .fetch_latest_canonical_hashes(self.config.num_of_canonical_hashes() as usize)?;
         self.connect_buffered_blocks_to_hashes(last_canonical_hashes)?;
 
         Ok(())
@@ -1171,7 +1157,7 @@ mod tests {
     use crate::block_buffer::BufferedBlocks;
     use assert_matches::assert_matches;
     use linked_hash_set::LinkedHashSet;
-    use reth_db::{test_utils::create_test_rw_db, transaction::DbTxMut, DatabaseEnv};
+    use reth_db::{tables, test_utils::create_test_rw_db, transaction::DbTxMut, DatabaseEnv};
     use reth_interfaces::test_utils::TestConsensus;
     use reth_primitives::{
         proofs::EMPTY_ROOT, stage::StageCheckpoint, ChainSpecBuilder, B256, MAINNET,
diff --git a/crates/blockchain-tree/src/externals.rs b/crates/blockchain-tree/src/externals.rs
index 9fd0163aa..06cd694d3 100644
--- a/crates/blockchain-tree/src/externals.rs
+++ b/crates/blockchain-tree/src/externals.rs
@@ -1,10 +1,10 @@
 //! Blockchain tree externals.
 
-use reth_db::database::Database;
-use reth_interfaces::consensus::Consensus;
-use reth_primitives::ChainSpec;
+use reth_db::{cursor::DbCursorRO, database::Database, tables, transaction::DbTx};
+use reth_interfaces::{consensus::Consensus, RethResult};
+use reth_primitives::{BlockHash, BlockNumber, ChainSpec};
 use reth_provider::ProviderFactory;
-use std::sync::Arc;
+use std::{collections::BTreeMap, sync::Arc};
 
 /// A container for external components.
 ///
@@ -44,4 +44,20 @@ impl<DB: Database, EF> TreeExternals<DB, EF> {
     pub fn database(&self) -> ProviderFactory<&DB> {
         ProviderFactory::new(&self.db, self.chain_spec.clone())
     }
+
+    /// Fetches the latest canonical block hashes by walking backwards from the head.
+    ///
+    /// Returns the hashes sorted by increasing block numbers
+    pub(crate) fn fetch_latest_canonical_hashes(
+        &self,
+        num_hashes: usize,
+    ) -> RethResult<BTreeMap<BlockNumber, BlockHash>> {
+        Ok(self
+            .db
+            .tx()?
+            .cursor_read::<tables::CanonicalHeaders>()?
+            .walk_back(None)?
+            .take(num_hashes)
+            .collect::<Result<BTreeMap<BlockNumber, BlockHash>, _>>()?)
+    }
 }
diff --git a/crates/blockchain-tree/src/state.rs b/crates/blockchain-tree/src/state.rs
index 3fcbcf2e8..bca7ddf40 100644
--- a/crates/blockchain-tree/src/state.rs
+++ b/crates/blockchain-tree/src/state.rs
@@ -25,7 +25,7 @@ impl TreeState {
     /// hashes.
     pub(crate) fn new(
         last_finalized_block_number: BlockNumber,
-        last_canonical_hashes: Vec<(BlockNumber, BlockHash)>,
+        last_canonical_hashes: impl IntoIterator<Item = (BlockNumber, BlockHash)>,
         buffer_limit: usize,
     ) -> Self {
         Self {