diff --git a/beacon_chain/eth1_monitor.nim b/beacon_chain/eth1_monitor.nim
index 1bed128e0..02ede1809 100644
--- a/beacon_chain/eth1_monitor.nim
+++ b/beacon_chain/eth1_monitor.nim
@@ -90,13 +90,13 @@ template depositContractAddress(m: Eth1Monitor): Eth1Address =
 template web3Url(m: Eth1Monitor): string =
   m.dataProvider.url
 
-proc fixupInfuraUrls*(web3Url: var string) =
+proc fixupWeb3Urls*(web3Url: var string) =
   ## Converts HTTP and HTTPS Infura URLs to their WebSocket equivalents
   ## because we are missing a functional HTTPS client.
   let normalizedUrl = toLowerAscii(web3Url)
   var pos = 0
 
-  template skip(x: string): bool =
+  template skip(x: string): bool {.dirty.} =
     if normalizedUrl.len - pos >= x.len and
        normalizedUrl.toOpenArray(pos, pos + x.len - 1) == x:
       pos += x.len
@@ -105,22 +105,28 @@ proc fixupInfuraUrls*(web3Url: var string) =
       false
 
   if not (skip("https://") or skip("http://")):
+    if not (skip("ws://") or skip("wss://")):
+      web3Url = "ws://" & web3Url
+      warn "The Web3 URL does not specify a protocol. Assuming a WebSocket server", web3Url
     return
 
-  let
-    isMainnet = skip("mainnet")
-    isGoerli = skip("goerli")
+  block infuraRewrite:
+    var pos = pos
+    let network = if skip("mainnet"): mainnet
+                  elif skip("goerli"): goerli
+                  else: break
 
-  if not (isMainnet or isGoerli):
+    if not skip(".infura.io/v3/"):
+      break
+
+    template infuraKey: string = normalizedUrl.substr(pos)
+
+    web3Url = "wss://" & $network & ".infura.io/ws/v3/" & infuraKey
     return
 
-  if not skip(".infura.io/v3/"):
-    return
-
-  template infuraKey: string = normalizedUrl.substr(pos)
-
-  web3Url = "wss://" & (if isMainnet: "mainnet" else: "goerli") &
-            ".infura.io/ws/v3/" & infuraKey
+  block gethRewrite:
+    web3Url = "ws://" & normalizedUrl.substr(pos)
+    warn "Only WebSocket web3 providers are supported. Rewriting URL", web3Url
 
 # TODO: Add preset validation
 # MIN_GENESIS_ACTIVE_VALIDATOR_COUNT should be larger than SLOTS_PER_EPOCH
@@ -392,7 +398,7 @@ proc init*(T: type Eth1Monitor,
            depositContractDeployedAt: string,
            eth1Network: Option[Eth1Network]): Future[Result[T, string]] {.async.} =
   var web3Url = web3Url
-  fixupInfuraUrls web3Url
+  fixupWeb3Urls web3Url
 
   let web3 = try: await newWeb3(web3Url)
              except CatchableError as err:
diff --git a/tests/test_eth1_monitor.nim b/tests/test_eth1_monitor.nim
index eae1af1bd..428cc86dd 100644
--- a/tests/test_eth1_monitor.nim
+++ b/tests/test_eth1_monitor.nim
@@ -17,15 +17,21 @@ suite "Eth1 monitor":
       goerliWssUrl = "wss://goerli.infura.io/ws/v3/6224f3c792cc443fafb64e70a98f871e"
       goerliHttpUrl = "http://goerli.infura.io/v3/6224f3c792cc443fafb64e70a98f871e"
       goerliHttpsUrl = "https://goerli.infura.io/v3/6224f3c792cc443fafb64e70a98f871e"
-      gethUrl = "ws://localhost:8545"
+      gethHttpUrl = "http://localhost:8545"
+      gethHttpsUrl = "https://localhost:8545"
+      gethWsUrl = "ws://localhost:8545"
+      unspecifiedProtocolUrl = "localhost:8545"
 
-    fixupInfuraUrls mainnetWssUrl
-    fixupInfuraUrls mainnetHttpUrl
-    fixupInfuraUrls mainnetHttpsUrl
-    fixupInfuraUrls goerliWssUrl
-    fixupInfuraUrls goerliHttpUrl
-    fixupInfuraUrls goerliHttpsUrl
-    fixupInfuraUrls gethUrl
+    fixupWeb3Urls mainnetWssUrl
+    fixupWeb3Urls mainnetHttpUrl
+    fixupWeb3Urls mainnetHttpsUrl
+    fixupWeb3Urls goerliWssUrl
+    fixupWeb3Urls goerliHttpUrl
+    fixupWeb3Urls goerliHttpsUrl
+    fixupWeb3Urls gethHttpUrl
+    fixupWeb3Urls gethHttpsUrl
+    fixupWeb3Urls gethWsUrl
+    fixupWeb3Urls unspecifiedProtocolUrl
 
     check:
       mainnetWssUrl == "wss://mainnet.infura.io/ws/v3/6224f3c792cc443fafb64e70a98f871e"
@@ -36,5 +42,9 @@ suite "Eth1 monitor":
       goerliHttpUrl == goerliWssUrl
       goerliHttpsUrl == goerliWssUrl
 
-      gethUrl == "ws://localhost:8545"
+      gethHttpUrl == gethWsUrl
+      gethHttpsUrl == gethWsUrl
+      unspecifiedProtocolUrl == gethWsUrl
+
+      gethWsUrl == "ws://localhost:8545"