diff --git a/GameBuildings.cpp b/GameBuildings.cpp
index f6dab7fa..2bf1d986 100644
--- a/GameBuildings.cpp
+++ b/GameBuildings.cpp
@@ -101,7 +101,7 @@ void MergeBuildingsToSegment(std::vector<Stonesense_Building>* buildings, WorldS
                         z2 = well_building->bucket_z;
                 }
 
-                for (uint32_t zz = copiedbuilding->z; zz >= z2; zz--) {
+                for (uint32_t zz = copiedbuilding->z + 1; zz-- > z2;) { // Avoid underflowing
                     if (copiedbuilding->type == df::enums::building_type::Civzone ||
                         copiedbuilding->type == df::enums::building_type::Stockpile ||
                         copiedbuilding->type == df::enums::building_type::FarmPlot) {
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 5ef44c6d..68b7b286 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -40,6 +40,7 @@ Template for new versions:
 ## New Features
 
 ## Fixes
+- `stonesense`: fixed hang when buildings are at the bottom of the world
 
 ## Misc Improvements