diff --git a/beacon_node/beacon_chain/src/beacon_chain.rs b/beacon_node/beacon_chain/src/beacon_chain.rs
index b6bf4e053e..33da14f53b 100644
--- a/beacon_node/beacon_chain/src/beacon_chain.rs
+++ b/beacon_node/beacon_chain/src/beacon_chain.rs
@@ -1039,11 +1039,6 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
         metrics::stop_timer(db_read_timer);
 
         write_block(&block, block_root, &self.log);
-        write_state(
-            &format!("state_pre_block_{}", block_root),
-            &parent_state,
-            &self.log,
-        );
 
         let catchup_timer = metrics::start_timer(&metrics::BLOCK_PROCESSING_CATCHUP_STATE);
 
@@ -1069,6 +1064,12 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
 
         metrics::stop_timer(committee_timer);
 
+        write_state(
+            &format!("state_pre_block_{}", block_root),
+            &state,
+            &self.log,
+        );
+
         let core_timer = metrics::start_timer(&metrics::BLOCK_PROCESSING_CORE);
 
         // Apply the received block to its parent state (which has been transitioned into this