diff --git a/.github/actions/checkpoint-sync/action.yaml b/.github/actions/checkpoint-sync/action.yaml
index 5bcb163..e6a4611 100644
--- a/.github/actions/checkpoint-sync/action.yaml
+++ b/.github/actions/checkpoint-sync/action.yaml
@@ -36,7 +36,7 @@ runs:
         beacon:
           upstreams:
           - name: state-provider
-            address: https://${{ inputs.network }}.checkpoint-sync.ethdevops.io
+            address: https://${{ inputs.network }}-debug.checkpoint-sync.ethdevops.io
             timeoutSeconds: 30
             dataProvider: true
         checkpointz:
diff --git a/pkg/service/eth/eth.go b/pkg/service/eth/eth.go
index 5eef263..9438b26 100644
--- a/pkg/service/eth/eth.go
+++ b/pkg/service/eth/eth.go
@@ -45,6 +45,8 @@ func (h *Handler) BeaconBlock(ctx context.Context, blockID BlockIdentifier) (*sp
 	}()
 
 	switch blockID.Type() {
+	case BlockIDGenesis:
+		return h.provider.GetBlockBySlot(ctx, phase0.Slot(0))
 	case BlockIDSlot:
 		slot, err := NewSlotFromString(blockID.Value())
 		if err != nil {