diff --git a/src/noggit/MapTile.cpp b/src/noggit/MapTile.cpp
index d363ded3..0e14b8c3 100755
--- a/src/noggit/MapTile.cpp
+++ b/src/noggit/MapTile.cpp
@@ -1781,6 +1781,18 @@ void MapTile::recalcCombinedExtents()
   if (!_combined_extents_dirty)
     return;
 
+  // ensure all extents are updated
+  {
+    recalcExtents();
+
+    if (Water.needsUpdate())
+    {
+      Water.recalcExtents();
+    }
+
+    recalcObjectInstanceExtents();
+  }
+
   _combined_extents = _extents;
 
   auto& water_extents =  Water.getExtents();
diff --git a/src/noggit/rendering/WorldRender.cpp b/src/noggit/rendering/WorldRender.cpp
index 0b46db2f..bf2b5733 100755
--- a/src/noggit/rendering/WorldRender.cpp
+++ b/src/noggit/rendering/WorldRender.cpp
@@ -107,7 +107,6 @@ void WorldRender::draw (glm::mat4x4 const& model_view
   unsigned tile_counter = 0;
   for (MapTile* tile : _world->mapIndex.loaded_tiles())
   {
-    tile->recalcObjectInstanceExtents();
     tile->recalcCombinedExtents();
 
     if (minimap_render)