diff --git a/common/webapp/src/js/map/TileManager.js b/common/webapp/src/js/map/TileManager.js
index feee3ae4f..3132d1404 100644
--- a/common/webapp/src/js/map/TileManager.js
+++ b/common/webapp/src/js/map/TileManager.js
@@ -134,13 +134,13 @@ export class TileManager {
 
     loadCloseTiles = () => {
         if (this.unloaded) return;
-        if (!this.loadNextTile()) return;
 
         if (this.loadTimeout) clearTimeout(this.loadTimeout);
+        this.loadTimeout = null;
+
+        while (this.currentlyLoading < 8 && this.loadNextTile());
 
-        if (this.currentlyLoading < 8) {
-            this.loadTimeout = setTimeout(this.loadCloseTiles, 0);
-        } else {
+        if (this.currentlyLoading >= 8) {
             this.loadTimeout = setTimeout(this.loadCloseTiles, 1000);
         }
     }