diff --git a/web3_proxy/src/rpcs/one.rs b/web3_proxy/src/rpcs/one.rs
index 8fbb88ab..5ab1de7b 100644
--- a/web3_proxy/src/rpcs/one.rs
+++ b/web3_proxy/src/rpcs/one.rs
@@ -678,10 +678,12 @@ impl Web3Rpc {
             };
 
             futures.push(flatten_handle(tokio::spawn(f)));
+        } else {
+            unimplemented!("there should always be a disconnect watch!");
         }
 
         // health check that runs if there haven't been any recent requests
-        {
+        if block_and_rpc_sender.is_some() {
             // TODO: move this into a proper function
             let rpc = self.clone();