diff --git a/s2ls/src/main/java/im/tny/segvault/s2ls/wifi/WiFiLocator.java b/s2ls/src/main/java/im/tny/segvault/s2ls/wifi/WiFiLocator.java
index 0a0778c..3533a33 100644
--- a/s2ls/src/main/java/im/tny/segvault/s2ls/wifi/WiFiLocator.java
+++ b/s2ls/src/main/java/im/tny/segvault/s2ls/wifi/WiFiLocator.java
@@ -131,15 +131,13 @@ public void updateCurrentBSSIDs(List<BSSID> bssids) {
                 listener.onLeftNetwork(this);
             }
         }
-        // only switch to a different station once its Wi-Fi signal is stronger
-        // than that of the current station
-        if (curLocation.size() > 0) {
-            Stop s = curLocation.get(0);
 
+        for (Stop s : curLocation) {
             if ((lastEntered != s || !prevLocation.contains(s)) && !blacklistedStations.contains(s)) {
                 listener.onEnteredStations(this, s);
                 lastEntered = s;
                 blacklistedStations.add(s);
+                break;
             }
         }
     }