diff --git a/dnscrypt-proxy/serversInfo.go b/dnscrypt-proxy/serversInfo.go
index c4b00858..39c9e4d1 100644
--- a/dnscrypt-proxy/serversInfo.go
+++ b/dnscrypt-proxy/serversInfo.go
@@ -327,8 +327,7 @@ func fetchDNSCryptServerInfo(proxy *Proxy, name string, stamp stamps.ServerStamp
 
 func fetchDoHServerInfo(proxy *Proxy, name string, stamp stamps.ServerStamp, isNew bool) (ServerInfo, error) {
 	if len(stamp.ServerAddrStr) > 0 {
-		addrStr := stamp.ServerAddrStr
-		ipOnly := addrStr[:strings.LastIndex(addrStr, ":")]
+		ipOnly, _ := ExtractHostAndPort(stamp.ServerAddrStr, -1)
 		proxy.xTransport.cachedIPs.Lock()
 		proxy.xTransport.cachedIPs.cache[stamp.ProviderName] = ipOnly
 		proxy.xTransport.cachedIPs.Unlock()