diff --git a/beacon-chain/sync/querier.go b/beacon-chain/sync/querier.go
index ff06ab16a..583b0618f 100644
--- a/beacon-chain/sync/querier.go
+++ b/beacon-chain/sync/querier.go
@@ -80,6 +80,7 @@ func NewQuerierService(ctx context.Context,
 		responseBuf:     responseBuf,
 		currentHeadSlot: cfg.CurrentHeadSlot,
 		chainStarted:    false,
+		atGenesis:       true,
 		powchain:        cfg.PowChain,
 		chainStartBuf:   make(chan time.Time, 1),
 		peerMap:         make(map[peer.ID]uint64),
diff --git a/beacon-chain/sync/service.go b/beacon-chain/sync/service.go
index 2b3082402..7aacaa766 100644
--- a/beacon-chain/sync/service.go
+++ b/beacon-chain/sync/service.go
@@ -94,7 +94,7 @@ func (ss *Service) Stop() error {
 // Status checks the status of the node. It returns nil if it's synced
 // with the rest of the network and no errors occurred. Otherwise, it returns an error.
 func (ss *Service) Status() error {
-	if !ss.querierFinished {
+	if !ss.querierFinished && !ss.Querier.atGenesis {
 		return errors.New("querier is still running")
 	}