diff --git a/core/src/main/java/net/ivpn/core/common/pinger/PingDataSet.kt b/core/src/main/java/net/ivpn/core/common/pinger/PingDataSet.kt
index ad93e605b..347b0446d 100644
--- a/core/src/main/java/net/ivpn/core/common/pinger/PingDataSet.kt
+++ b/core/src/main/java/net/ivpn/core/common/pinger/PingDataSet.kt
@@ -122,17 +122,16 @@ class PingDataSet @Inject constructor(
     private fun calculateFastestServer(pings: MutableMap<Server, PingResultFormatter?>): Server? {
         var fastestServer: Server? = null
         var lowestPing = Long.MAX_VALUE
-        var excludedServers = serversRepository.getExcludedServersList()
+        val excludedServers = serversRepository.getExcludedServersList()
         for ((server, result) in pings) {
-            fastestServer?.let { _ ->
-                result?.let { result ->
-                    if (!excludedServers.contains(server) && result.isPingAvailable && lowestPing > result.ping) {
-                        fastestServer = server
-                        lowestPing = result.ping
-                    }
+            if (excludedServers.contains(server)) {
+                continue
+            }
+            result?.let { pingResult ->
+                if (pingResult.isPingAvailable && lowestPing > pingResult.ping) {
+                    fastestServer = server
+                    lowestPing = pingResult.ping
                 }
-            } ?: run {
-                fastestServer = server
             }
         }