diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index d41bd77b79..0313149341 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -2170,11 +2170,15 @@ func RegisterFilterAPI(stack *node.Node, backend ethapi.Backend, ethcfg *ethconf
 		LogCacheSize: ethcfg.FilterLogCacheSize,
 	})
 
+	filterAPI := filters.NewFilterAPI(filterSystem, isLightClient, ethconfig.Defaults.BorLogs)
 	stack.RegisterAPIs([]rpc.API{{
 		Namespace: "eth",
-		Service:   filters.NewFilterAPI(filterSystem, isLightClient, ethconfig.Defaults.BorLogs),
+		Service:   filterAPI,
 	}})
 
+	// avoiding constructor changed by introducing new method to set genesis
+	filterAPI.SetChainConfig(ethcfg.Genesis.Config)
+
 	return filterSystem
 }
 
diff --git a/eth/filters/filter_system_test.go b/eth/filters/filter_system_test.go
index dc88b1ba68..43d79f3723 100644
--- a/eth/filters/filter_system_test.go
+++ b/eth/filters/filter_system_test.go
@@ -491,6 +491,8 @@ func TestInvalidGetLogsRequest(t *testing.T) {
 		blockHash = common.HexToHash("0x1111111111111111111111111111111111111111111111111111111111111111")
 	)
 
+	api.SetChainConfig(params.BorUnittestChainConfig)
+
 	// Reason: Cannot specify both BlockHash and FromBlock/ToBlock)
 	testCases := []FilterCriteria{
 		0: {BlockHash: &blockHash, FromBlock: big.NewInt(100)},
@@ -808,6 +810,7 @@ func TestPendingLogsSubscription(t *testing.T) {
 		<-testCases[i].sub.Err()
 	}
 }
+
 // nolint:gocognit
 func TestLightFilterLogs(t *testing.T) {
 	t.Parallel()