diff --git a/dnscrypt-proxy/proxy.go b/dnscrypt-proxy/proxy.go
index 42a957b3..3b5cb5d9 100644
--- a/dnscrypt-proxy/proxy.go
+++ b/dnscrypt-proxy/proxy.go
@@ -314,7 +314,7 @@ func (proxy *Proxy) processIncomingQuery(serverInfo *ServerInfo, clientProto str
 			serverInfo.noticeFailure(proxy)
 			return
 		}
-		if rcode := Rcode(response); rcode == 5 { // REFUSED
+		if rcode := Rcode(response); rcode == 2 || rcode == 5 { // SERVFAIL / REFUSED
 			dlog.Infof("Server [%v] returned error code [%v] -- It might be experiencing upstream connectivity issues", serverInfo.Name, rcode)
 			serverInfo.noticeFailure(proxy)
 		} else {