diff --git a/app/src/main/java/net/vonforst/evmap/api/availability/EnBwAvailabilityDetector.kt b/app/src/main/java/net/vonforst/evmap/api/availability/EnBwAvailabilityDetector.kt
index 217b31e7..70c86f04 100644
--- a/app/src/main/java/net/vonforst/evmap/api/availability/EnBwAvailabilityDetector.kt
+++ b/app/src/main/java/net/vonforst/evmap/api/availability/EnBwAvailabilityDetector.kt
@@ -105,16 +105,18 @@ class EnBwAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
         var markers =
             api.getMarkers(lng - coordRange, lng + coordRange, lat - coordRange, lat + coordRange)
 
-        markers = markers.flatMap {
-            if (it.grouped) {
-                api.getMarkers(
-                    it.viewPort.lowerLeftLon,
-                    it.viewPort.upperRightLon,
-                    it.viewPort.lowerLeftLat,
-                    it.viewPort.upperRightLat
-                )
-            } else {
-                listOf(it)
+        while (markers.any { it.grouped }) {
+            markers = markers.flatMap {
+                if (it.grouped) {
+                    api.getMarkers(
+                        it.viewPort.lowerLeftLon,
+                        it.viewPort.upperRightLon,
+                        it.viewPort.lowerLeftLat,
+                        it.viewPort.upperRightLat
+                    )
+                } else {
+                    listOf(it)
+                }
             }
         }