diff --git a/beacon-chain/db/kv/state.go b/beacon-chain/db/kv/state.go
index 263f8f7db..19d0b044b 100644
--- a/beacon-chain/db/kv/state.go
+++ b/beacon-chain/db/kv/state.go
@@ -517,6 +517,19 @@ func (s *Store) unmarshalState(_ context.Context, enc []byte, validatorEntries [
 	}
 
 	switch {
+	case hasBadgerKey(enc):
+		protoState := &ethpb.BeaconStateBadger{}
+		if err := protoState.UnmarshalSSZ(enc[len(badgerKey):]); err != nil {
+			return nil, errors.Wrap(err, "failed to unmarshal encoding for Badger")
+		}
+		ok, err := s.isStateValidatorMigrationOver()
+		if err != nil {
+			return nil, err
+		}
+		if ok {
+			protoState.Validators = validatorEntries
+		}
+		return statenative.InitializeFromProtoUnsafeBadger(protoState)
 	case hasElectraKey(enc):
 		protoState := &ethpb.BeaconStateElectra{}
 		if err := protoState.UnmarshalSSZ(enc[len(electraKey):]); err != nil {
diff --git a/consensus-types/blocks/execution.go b/consensus-types/blocks/execution.go
index 919deb033..f4595f1c5 100644
--- a/consensus-types/blocks/execution.go
+++ b/consensus-types/blocks/execution.go
@@ -784,7 +784,10 @@ func PayloadToHeaderDeneb(payload interfaces.ExecutionData) (*enginev1.Execution
 	}, nil
 }
 
-var PayloadToHeaderElectra = PayloadToHeaderDeneb
+var (
+	PayloadToHeaderElectra = PayloadToHeaderDeneb
+	PayloadToHeaderBadger  = PayloadToHeaderDeneb
+)
 
 // IsEmptyExecutionData checks if an execution data is empty underneath. If a single field has
 // a non-zero value, this function will return false.
diff --git a/consensus-types/blocks/getters.go b/consensus-types/blocks/getters.go
index 1af00e610..1f57d053b 100644
--- a/consensus-types/blocks/getters.go
+++ b/consensus-types/blocks/getters.go
@@ -166,6 +166,41 @@ func (b *SignedBeaconBlock) ToBlinded() (interfaces.ReadOnlySignedBeaconBlock, e
 		return nil, err
 	}
 
+	if b.version >= version.Badger {
+		p, ok := payload.Proto().(*enginev1.ExecutionPayloadDeneb)
+		if !ok {
+			return nil, fmt.Errorf("%T is not an execution payload header of Deneb version", p)
+		}
+		header, err := PayloadToHeaderBadger(payload)
+		if err != nil {
+			return nil, errors.Wrap(err, "payload to header badger")
+		}
+
+		return initBlindedSignedBlockFromProtoBadger(
+			&eth.SignedBlindedBeaconBlockBadger{
+				Message: &eth.BlindedBeaconBlockBadger{
+					Slot:          b.block.slot,
+					ProposerIndex: b.block.proposerIndex,
+					ParentRoot:    b.block.parentRoot[:],
+					StateRoot:     b.block.stateRoot[:],
+					Body: &eth.BlindedBeaconBlockBodyBadger{
+						RandaoReveal:           b.block.body.randaoReveal[:],
+						Eth1Data:               b.block.body.eth1Data,
+						Graffiti:               b.block.body.graffiti[:],
+						ProposerSlashings:      b.block.body.proposerSlashings,
+						AttesterSlashings:      b.block.body.attesterSlashingsElectra,
+						Attestations:           b.block.body.attestationsElectra,
+						Deposits:               b.block.body.deposits,
+						VoluntaryExits:         b.block.body.voluntaryExits,
+						ExecutionPayloadHeader: header,
+						BlobKzgCommitments:     b.block.body.blobKzgCommitments,
+						ExecutionRequests:      b.block.body.executionRequests,
+					},
+				},
+				Signature: b.signature[:],
+			})
+	}
+
 	if b.version >= version.Alpaca {
 		p, ok := payload.Proto().(*enginev1.ExecutionPayloadDeneb)
 		if !ok {
@@ -173,7 +208,7 @@ func (b *SignedBeaconBlock) ToBlinded() (interfaces.ReadOnlySignedBeaconBlock, e
 		}
 		header, err := PayloadToHeaderElectra(payload)
 		if err != nil {
-			return nil, err
+			return nil, errors.Wrap(err, "payload to header electra")
 		}
 		return initBlindedSignedBlockFromProtoElectra(
 			&eth.SignedBlindedBeaconBlockElectra{
diff --git a/consensus-types/blocks/proto.go b/consensus-types/blocks/proto.go
index e35b21cf2..7e7d17b88 100644
--- a/consensus-types/blocks/proto.go
+++ b/consensus-types/blocks/proto.go
@@ -1098,7 +1098,6 @@ func initBlindedBlockFromProtoBadger(pb *eth.BlindedBeaconBlockBadger) (*BeaconB
 	return b, nil
 }
 
-
 func initBlockBodyFromProtoPhase0(pb *eth.BeaconBlockBody) (*BeaconBlockBody, error) {
 	if pb == nil {
 		return nil, errNilBlockBody
@@ -1411,4 +1410,4 @@ func initBlindedBlockBodyFromProtoBadger(pb *eth.BlindedBeaconBlockBodyBadger) (
 		executionRequests:        er,
 	}
 	return b, nil
-}
\ No newline at end of file
+}