diff --git a/dnscrypt-proxy/serversInfo.go b/dnscrypt-proxy/serversInfo.go
index 75a53bba..45dda97e 100644
--- a/dnscrypt-proxy/serversInfo.go
+++ b/dnscrypt-proxy/serversInfo.go
@@ -224,27 +224,26 @@ func (serversInfo *ServersInfo) refresh(proxy *Proxy) (int, error) {
 	dlog.Debug("Refreshing certificates")
 	serversInfo.RLock()
 	// Appending registeredServers slice from sources may allocate new memory.
-	registeredServers := make([]RegisteredServer, len(serversInfo.registeredServers))
+	serversCount := len(serversInfo.registeredServers)
+	registeredServers := make([]RegisteredServer, serversCount)
 	copy(registeredServers, serversInfo.registeredServers)
 	serversInfo.RUnlock()
-
 	countChannel := make(chan struct{}, proxy.certRefreshConcurrency)
-	waitChannel := make(chan struct{})
-	var err error
+	errorChannel := make(chan error, serversCount)
 	for i := range registeredServers {
 		countChannel <- struct{}{}
 		go func(registeredServer *RegisteredServer) {
-			if err = serversInfo.refreshServer(proxy, registeredServer.name, registeredServer.stamp); err == nil {
+			err := serversInfo.refreshServer(proxy, registeredServer.name, registeredServer.stamp)
+			if err == nil {
 				proxy.xTransport.internalResolverReady = true
 			}
+			errorChannel <- err
 			<-countChannel
-			if len(countChannel) == 0 {
-				close(waitChannel)
-			}
 		}(&registeredServers[i])
 	}
-	if len(registeredServers) > 0 {
-		<-waitChannel
+	var err error
+	for i := 0; i < serversCount; i++ {
+		err = <-errorChannel
 	}
 	serversInfo.Lock()
 	sort.SliceStable(serversInfo.inner, func(i, j int) bool {
@@ -262,6 +261,9 @@ func (serversInfo *ServersInfo) refresh(proxy *Proxy) (int, error) {
 		dlog.Noticef("Server with the lowest initial latency: %s (rtt: %dms)", inner[0].Name, inner[0].initialRtt)
 	}
 	serversInfo.Unlock()
+	if innerLen > 0 {
+		err = nil
+	}
 	return innerLen, err
 }