diff --git a/frontend-js/src/main/js/map/AbstractCustomMap.js b/frontend-js/src/main/js/map/AbstractCustomMap.js
index 0df275877126c79c280af4f7f8d3f71d993aa33a..bd2c5e06bafe23397b2cc60f3adf9e5e745a1a63 100644
--- a/frontend-js/src/main/js/map/AbstractCustomMap.js
+++ b/frontend-js/src/main/js/map/AbstractCustomMap.js
@@ -918,8 +918,7 @@ AbstractCustomMap.prototype.addCenterButton = function () {
       bounds.extend(self.getTopLeftLatLng());
       bounds.extend(self.getBottomRightLatLng());
 
-      self.getGoogleMap().fitBounds(bounds);
-      return false;
+      return self.getGoogleMap().fitBounds(bounds);
     },
     xss: false
   });
@@ -1131,7 +1130,7 @@ AbstractCustomMap.prototype.fitBounds = function (markers) {
       }
     }
     if (!bounds.isEmpty()) {
-      map.fitBounds(bounds);
+      return map.fitBounds(bounds);
     }
   }
 };
diff --git a/frontend-js/src/main/js/map/CustomMap.js b/frontend-js/src/main/js/map/CustomMap.js
index 664e088d90cffeb0df05d80679d280c2feb9d082..96041ec35cf92f0c99c95ec72e6c448bb0bf9d74 100644
--- a/frontend-js/src/main/js/map/CustomMap.js
+++ b/frontend-js/src/main/js/map/CustomMap.js
@@ -467,7 +467,7 @@ CustomMap.prototype.customizeGoogleMapView = function (div) {
     bounds.extend(self.getTopLeftLatLng());
     bounds.extend(self.getBottomRightLatLng());
 
-    self.getGoogleMap().fitBounds(bounds);
+    return self.getGoogleMap().fitBounds(bounds);
   }
 };
 
@@ -731,11 +731,13 @@ CustomMap.prototype.renderOverlayCollection = function (params) {
       }
     });
   }).then(function () {
+    var promises = [];
     if (elements.length > 0 && fitBounds) {
       for (var j = 0; j < submaps.length; j++) {
-        submaps[j].fitBounds(markers);
+        promises.push(submaps[j].fitBounds(markers));
       }
     }
+    return Promise.all(promises);
   });
 };