diff --git a/Cargo.lock b/Cargo.lock
index 95738a4ffd8..7987d34e20b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2662,6 +2662,7 @@ dependencies = [
  "near-test-contracts",
  "near-vm-runner",
  "nearcore",
+ "node-runtime",
  "tempfile",
 ]
 
diff --git a/genesis-tools/genesis-populate/Cargo.toml b/genesis-tools/genesis-populate/Cargo.toml
index 433900b94a6..4e1a9ab8a6e 100644
--- a/genesis-tools/genesis-populate/Cargo.toml
+++ b/genesis-tools/genesis-populate/Cargo.toml
@@ -27,6 +27,7 @@ near-store.workspace = true
 near-chain.workspace = true
 near-test-contracts.workspace = true
 near-vm-runner.workspace = true
+node-runtime.workspace = true
 
 [features]
 nightly_protocol = [
@@ -38,6 +39,7 @@ nightly_protocol = [
   "near-store/nightly_protocol",
   "near-vm-runner/nightly_protocol",
   "nearcore/nightly_protocol",
+  "node-runtime/nightly_protocol",
 ]
 nightly = [
   "near-async/nightly",
@@ -49,4 +51,5 @@ nightly = [
   "near-vm-runner/nightly",
   "nearcore/nightly",
   "nightly_protocol",
+  "node-runtime/nightly",
 ]
diff --git a/genesis-tools/genesis-populate/src/lib.rs b/genesis-tools/genesis-populate/src/lib.rs
index 7e7ba1fa496..0bd5f0b1422 100644
--- a/genesis-tools/genesis-populate/src/lib.rs
+++ b/genesis-tools/genesis-populate/src/lib.rs
@@ -28,6 +28,7 @@ use near_store::{
 use near_vm_runner::logic::ProtocolVersion;
 use near_vm_runner::ContractCode;
 use nearcore::{NearConfig, NightshadeRuntime, NightshadeRuntimeExt};
+pub use node_runtime::bootstrap_congestion_info;
 use std::collections::BTreeMap;
 use std::hash::{Hash, Hasher};
 use std::path::{Path, PathBuf};
@@ -249,17 +250,20 @@ impl GenesisBuilder {
         store_update.save_block(genesis.clone());
 
         let protocol_version = self.genesis.config.protocol_version;
-        let congestion_info = Self::get_congestion_control(protocol_version);
-        for (chunk_header, state_root) in genesis.chunks().iter().zip(self.roots.values()) {
+        for (chunk_header, &state_root) in genesis.chunks().iter().zip(self.roots.values()) {
+            let shard_layout = &self.genesis.config.shard_layout;
+            let shard_id = chunk_header.shard_id();
+            let shard_uid = ShardUId::from_shard_id_and_layout(shard_id, &shard_layout);
+
+            let congestion_info =
+                self.get_congestion_info(protocol_version, &genesis, shard_id, state_root)?;
+
             store_update.save_chunk_extra(
                 genesis.hash(),
-                &ShardUId::from_shard_id_and_layout(
-                    chunk_header.shard_id(),
-                    &self.genesis.config.shard_layout,
-                ),
+                &shard_uid,
                 ChunkExtra::new(
                     self.genesis.config.protocol_version,
-                    state_root,
+                    &state_root,
                     CryptoHash::default(),
                     vec![],
                     0,
@@ -278,13 +282,22 @@ impl GenesisBuilder {
         Ok(())
     }
 
-    fn get_congestion_control(protocol_version: ProtocolVersion) -> Option<CongestionInfo> {
-        if ProtocolFeature::CongestionControl.enabled(protocol_version) {
-            // TODO(congestion_control) - properly initialize
-            Some(CongestionInfo::default())
-        } else {
-            None
+    fn get_congestion_info(
+        &self,
+        protocol_version: ProtocolVersion,
+        genesis: &Block,
+        shard_id: u64,
+        state_root: CryptoHash,
+    ) -> Result<Option<CongestionInfo>> {
+        if !ProtocolFeature::CongestionControl.enabled(protocol_version) {
+            return Ok(None);
         }
+        let prev_hash = genesis.header().prev_hash();
+        let trie = self.runtime.get_trie_for_shard(shard_id, prev_hash, state_root, true)?;
+        let protocol_config = self.runtime.get_protocol_config(genesis.header().epoch_id())?;
+        let runtime_config = protocol_config.runtime_config;
+        let congestion_info = bootstrap_congestion_info(&trie, &runtime_config, shard_id)?;
+        Ok(Some(congestion_info))
     }
 
     fn add_additional_account(&mut self, account_id: AccountId) -> Result<()> {