diff --git a/specs/eip4844/fork.md b/specs/eip4844/fork.md
index 62908112a..9d42a2302 100644
--- a/specs/eip4844/fork.md
+++ b/specs/eip4844/fork.md
@@ -111,9 +111,9 @@ def upgrade_to_eip4844(pre: capella.BeaconState) -> BeaconState:
         # Execution-layer
         latest_execution_payload_header=pre.latest_execution_payload_header,
         # Withdrawals
-        withdrawal_queue=[],
-        next_withdrawal_index=WithdrawalIndex(0),
-        next_partial_withdrawal_validator_index=ValidatorIndex(0),
+        withdrawal_queue=pre.withdrawal_queue,
+        next_withdrawal_index=pre.next_withdrawal_index,
+        next_partial_withdrawal_validator_index=pre.next_partial_withdrawal_validator_index,
     )
 
     return post
diff --git a/tests/core/pyspec/eth2spec/test/context.py b/tests/core/pyspec/eth2spec/test/context.py
index bc04c05f2..242a0f891 100644
--- a/tests/core/pyspec/eth2spec/test/context.py
+++ b/tests/core/pyspec/eth2spec/test/context.py
@@ -14,7 +14,7 @@ from .helpers.constants import (
     PHASE0, ALTAIR, BELLATRIX, CAPELLA, EIP4844, SHARDING,
     MINIMAL, MAINNET,
     ALL_PHASES, FORKS_BEFORE_ALTAIR, FORKS_BEFORE_BELLATRIX,
-    ALL_FORK_UPGRADES,
+    FORKS_BEFORE_CAPELLA, ALL_FORK_UPGRADES,
 )
 from .helpers.typing import SpecForkName, PresetBaseName
 from .helpers.genesis import create_genesis_state
@@ -596,7 +596,7 @@ def is_post_bellatrix(spec):
 
 
 def is_post_capella(spec):
-    return spec.fork == CAPELLA
+    return spec.fork not in FORKS_BEFORE_CAPELLA
 
 
 def is_post_eip4844(spec):