diff --git a/src/main/kotlin/io/emeraldpay/dshackle/startup/ConfiguredUpstreams.kt b/src/main/kotlin/io/emeraldpay/dshackle/startup/ConfiguredUpstreams.kt
index 250361d9..e984e91b 100644
--- a/src/main/kotlin/io/emeraldpay/dshackle/startup/ConfiguredUpstreams.kt
+++ b/src/main/kotlin/io/emeraldpay/dshackle/startup/ConfiguredUpstreams.kt
@@ -110,7 +110,7 @@ open class ConfiguredUpstreams(
 
     fun hasMatchingUpstream(chain: Chain, matcher: Selector.LabelSelectorMatcher): Boolean =
         config.upstreams.any { up ->
-            up.chain?.equals(chain.chainName, ignoreCase = true) ?: true && matcher.matches(up.labels)
+            (up.chain?.let { Global.chainById(it) == chain } ?: true) && matcher.matches(up.labels)
         }
 
     private fun buildDefaultOptions(config: UpstreamsConfig): HashMap<Chain, UpstreamsConfig.Options> {