diff --git a/src/app/runtime_genesis_ledger/runtime_genesis_ledger.ml b/src/app/runtime_genesis_ledger/runtime_genesis_ledger.ml
index 1032d3a85219..2d8a29432e9d 100644
--- a/src/app/runtime_genesis_ledger/runtime_genesis_ledger.ml
+++ b/src/app/runtime_genesis_ledger/runtime_genesis_ledger.ml
@@ -80,8 +80,9 @@ let extract_accounts_exn = function
   | { Runtime_config.Ledger.base = Accounts accounts
     ; num_accounts = None
     ; balances = []
-    (* ; add_genesis_winner = Some false *)
-    ; _
+    ; hash = _
+    ; name = None
+    ; add_genesis_winner = Some false
     } ->
       accounts
   | _ ->
diff --git a/src/lib/mina_graphql/mina_graphql.ml b/src/lib/mina_graphql/mina_graphql.ml
index 990afd1aaec4..571389750895 100644
--- a/src/lib/mina_graphql/mina_graphql.ml
+++ b/src/lib/mina_graphql/mina_graphql.ml
@@ -4464,7 +4464,7 @@ module Queries = struct
           Runtime_config.make_fork_config ~staged_ledger ~global_slot
             ~state_hash ~staking_ledger ~staking_epoch_seed
             ~next_epoch_ledger:(Some next_epoch_ledger) ~next_epoch_seed
-            ~blockchain_length runtime_config
+            ~blockchain_length
         in
         let%map () =
           let open Async.Deferred.Infix in
diff --git a/src/lib/runtime_config/runtime_config.ml b/src/lib/runtime_config/runtime_config.ml
index 36af43533e9e..b7db7a1e33ff 100644
--- a/src/lib/runtime_config/runtime_config.ml
+++ b/src/lib/runtime_config/runtime_config.ml
@@ -1286,16 +1286,15 @@ let ledger_accounts (ledger : Mina_base.Ledger.Any_ledger.witness) =
 let ledger_of_accounts accounts =
   Ledger.
     { base = Accounts accounts
-    ; num_accounts = Some (List.length accounts)
-    ; balances = List.mapi accounts ~f:(fun i a -> (i, a.balance))
+    ; num_accounts = None
+    ; balances = []
     ; hash = None
     ; name = None
     ; add_genesis_winner = Some false
     }
 
 let make_fork_config ~staged_ledger ~global_slot ~state_hash ~blockchain_length
-    ~staking_ledger ~staking_epoch_seed ~next_epoch_ledger ~next_epoch_seed
-    (runtime_config : t) =
+    ~staking_ledger ~staking_epoch_seed ~next_epoch_ledger ~next_epoch_seed =
   let open Async.Deferred.Result.Let_syntax in
   let global_slot_since_genesis = Mina_numbers.Global_slot.to_int global_slot in
   let blockchain_length = Unsigned.UInt32.to_int blockchain_length in
@@ -1308,7 +1307,10 @@ let make_fork_config ~staged_ledger ~global_slot ~state_hash ~blockchain_length
     Mina_base.Ledger.Any_ledger.cast (module Mina_base.Ledger) staged_ledger
     |> ledger_accounts
   in
-  let ledger = Option.value_exn runtime_config.ledger in
+  let hash =
+    Option.some @@ Mina_base.Ledger_hash.to_base58_check
+    @@ Mina_base.Ledger.merkle_root staged_ledger
+  in
   let fork =
     Fork_config.
       { state_hash = Mina_base.State_hash.to_base58_check state_hash
@@ -1348,7 +1350,13 @@ let make_fork_config ~staged_ledger ~global_slot ~state_hash ~blockchain_length
      startup, even though it already exists, leading to an error.*)
     ~epoch_data
     ~ledger:
-      { ledger with base = Accounts accounts; add_genesis_winner = Some false }
+      { base = Accounts accounts
+      ; num_accounts = None
+      ; balances = []
+      ; hash
+      ; name = None
+      ; add_genesis_winner = Some false
+      }
     ~proof:(Proof_keys.make ~fork ()) ()
 
 let slot_tx_end_or_default, slot_chain_end_or_default =