diff --git a/beacon/blsync/block_sync.go b/beacon/blsync/block_sync.go
index ef852dfe99..3ab156354d 100755
--- a/beacon/blsync/block_sync.go
+++ b/beacon/blsync/block_sync.go
@@ -19,6 +19,7 @@ package blsync
 import (
 	"github.com/ethereum/go-ethereum/beacon/light/request"
 	"github.com/ethereum/go-ethereum/beacon/light/sync"
+	"github.com/ethereum/go-ethereum/beacon/params"
 	"github.com/ethereum/go-ethereum/beacon/types"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/lru"
@@ -117,15 +118,31 @@ func (s *beaconBlockSync) updateEventFeed() {
 	if !ok {
 		return
 	}
-	finality, ok := s.headTracker.ValidatedFinality() //TODO fetch directly if subscription does not deliver
-	if !ok || head.Header.Epoch() != finality.Attested.Header.Epoch() {
-		return
-	}
+
 	validatedHead := head.Header.Hash()
 	headBlock, ok := s.recentBlocks.Get(validatedHead)
 	if !ok {
 		return
 	}
+
+	var finalizedHash common.Hash
+	if finality, ok := s.headTracker.ValidatedFinality(); ok {
+		he := head.Header.Epoch()
+		fe := finality.Attested.Header.Epoch()
+		switch {
+		case he == fe:
+			finalizedHash = finality.Finalized.PayloadHeader.BlockHash()
+		case he < fe:
+			return
+		case he == fe+1:
+			parent, ok := s.recentBlocks.Get(head.Header.ParentRoot)
+			if !ok || parent.Slot()/params.EpochLength == fe {
+				return // head is at first slot of next epoch, wait for finality update
+				//TODO: try to fetch finality update directly if subscription does not deliver
+			}
+		}
+	}
+
 	headInfo := blockHeadInfo(headBlock)
 	if headInfo == s.lastHeadInfo {
 		return
@@ -141,6 +158,6 @@ func (s *beaconBlockSync) updateEventFeed() {
 	s.chainHeadFeed.Send(types.ChainHeadEvent{
 		BeaconHead: head.Header,
 		Block:      execBlock,
-		Finalized:  finality.Finalized.PayloadHeader.BlockHash(),
+		Finalized:  finalizedHash,
 	})
 }