diff --git a/chain/ethereum/src/chain.rs b/chain/ethereum/src/chain.rs
index c20f28a6ada..ad1a77db1ee 100644
--- a/chain/ethereum/src/chain.rs
+++ b/chain/ethereum/src/chain.rs
@@ -389,7 +389,7 @@ impl Chain {
     // caller can spawn.
     pub async fn cheapest_adapter(&self) -> Arc<EthereumAdapter> {
         let adapters = match self.client.as_ref() {
-            ChainClient::Firehose(_, _) => panic!("no adapter with firehose"),
+            ChainClient::Firehose(_) => panic!("no adapter with firehose"),
             ChainClient::Rpc(adapter) => adapter,
         };
         adapters.cheapest().await.unwrap()
@@ -472,7 +472,7 @@ impl Blockchain for Chain {
                     )
                     .await
             }
-            ChainClient::Firehose(_, _) => {
+            ChainClient::Firehose(_) => {
                 self.block_stream_builder
                     .build_firehose(
                         self,
@@ -498,7 +498,7 @@ impl Blockchain for Chain {
         number: BlockNumber,
     ) -> Result<BlockPtr, IngestorError> {
         match self.client.as_ref() {
-            ChainClient::Firehose(endpoints, _) => endpoints
+            ChainClient::Firehose(endpoints) => endpoints
                 .endpoint()
                 .await?
                 .block_ptr_for_number::<HeaderOnlyBlock>(logger, number)
@@ -557,7 +557,7 @@ impl Blockchain for Chain {
 
     async fn block_ingestor(&self) -> anyhow::Result<Box<dyn BlockIngestor>> {
         let ingestor: Box<dyn BlockIngestor> = match self.chain_client().as_ref() {
-            ChainClient::Firehose(_, _) => {
+            ChainClient::Firehose(_) => {
                 let ingestor = FirehoseBlockIngestor::<HeaderOnlyBlock, Self>::new(
                     self.chain_store.cheap_clone(),
                     self.chain_client(),
@@ -852,7 +852,7 @@ impl TriggersAdapterTrait<Chain> for TriggersAdapter {
         use graph::prelude::LightEthereumBlockExt;
 
         let block = match self.chain_client.as_ref() {
-            ChainClient::Firehose(_, _) => Some(BlockPtr {
+            ChainClient::Firehose(_) => Some(BlockPtr {
                 hash: BlockHash::from(vec![0xff; 32]),
                 number: block.number.saturating_sub(1),
             }),
diff --git a/graph/src/blockchain/client.rs b/graph/src/blockchain/client.rs
index 666666955f4..1ac1b4f892c 100644
--- a/graph/src/blockchain/client.rs
+++ b/graph/src/blockchain/client.rs
@@ -11,17 +11,13 @@ use anyhow::anyhow;
 // Substreams only requires the FirehoseEndpoints.
 #[derive(Debug)]
 pub enum ChainClient<C: Blockchain> {
-    Firehose(FirehoseEndpoints, Option<C::Client>),
+    Firehose(FirehoseEndpoints),
     Rpc(C::Client),
 }
 
 impl<C: Blockchain> ChainClient<C> {
     pub fn new_firehose(firehose_endpoints: FirehoseEndpoints) -> Self {
-        Self::Firehose(firehose_endpoints, None)
-    }
-
-    pub fn new_firehose_with_rpc(firehose_endpoints: FirehoseEndpoints, rpc: C::Client) -> Self {
-        Self::Firehose(firehose_endpoints, Some(rpc))
+        Self::Firehose(firehose_endpoints)
     }
 
     pub fn new_rpc(rpc: C::Client) -> Self {
@@ -30,14 +26,14 @@ impl<C: Blockchain> ChainClient<C> {
 
     pub fn is_firehose(&self) -> bool {
         match self {
-            ChainClient::Firehose(_, _) => true,
+            ChainClient::Firehose(_) => true,
             ChainClient::Rpc(_) => false,
         }
     }
 
     pub async fn firehose_endpoint(&self) -> anyhow::Result<Arc<FirehoseEndpoint>> {
         match self {
-            ChainClient::Firehose(endpoints, _) => endpoints.endpoint().await,
+            ChainClient::Firehose(endpoints) => endpoints.endpoint().await,
             _ => Err(anyhow!("firehose endpoint requested on rpc chain client")),
         }
     }
@@ -45,8 +41,7 @@ impl<C: Blockchain> ChainClient<C> {
     pub fn rpc(&self) -> anyhow::Result<&C::Client> {
         match self {
             Self::Rpc(rpc) => Ok(rpc),
-            Self::Firehose(_, Some(rpc)) => Ok(rpc),
-            _ => Err(anyhow!("rpc endpoint requested on firehose chain client")),
+            Self::Firehose(_) => Err(anyhow!("rpc endpoint requested on firehose chain client")),
         }
     }
 }
diff --git a/node/src/chain.rs b/node/src/chain.rs
index 57640c8d13b..3e87ff8295b 100644
--- a/node/src/chain.rs
+++ b/node/src/chain.rs
@@ -523,10 +523,7 @@ pub async fn networks_as_chains(
                 let eth_adapters = networks.ethereum_rpcs(chain_id.clone());
 
                 let cc = if firehose_endpoints.len() > 0 {
-                    ChainClient::<graph_chain_ethereum::Chain>::new_firehose_with_rpc(
-                        firehose_endpoints,
-                        eth_adapters.clone(),
-                    )
+                    ChainClient::<graph_chain_ethereum::Chain>::new_firehose(firehose_endpoints)
                 } else {
                     ChainClient::<graph_chain_ethereum::Chain>::new_rpc(eth_adapters.clone())
                 };