diff --git a/distribution/changelog.txt b/distribution/changelog.txt
index 346055c086..8b8fc1c3d5 100644
--- a/distribution/changelog.txt
+++ b/distribution/changelog.txt
@@ -7,6 +7,7 @@
 - Fix: [#24346] Possible crash during line drawing in OpenGL mode.
 - Fix: [#24353] ‘Show dirty visuals’ is off by one pixel and does not work correctly with higher framerates.
 - Fix: [#24362] When upgrading from an older version on Windows, old versions of official objects are not always removed.  
+- Fix: [#24371] Fix divide by zero in the scenery window when there is no scenery.
 
 0.4.22 (2025-05-04)
 ------------------------------------------------------------------------
diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp
index 34aedd66bd..a917fa129f 100644
--- a/src/openrct2-ui/windows/Scenery.cpp
+++ b/src/openrct2-ui/windows/Scenery.cpp
@@ -1372,7 +1372,7 @@ namespace OpenRCT2::Ui::Windows
         int32_t GetMaxTabCountInARow()
         {
             int32_t tabEntries = static_cast<int32_t>(_tabEntries.size());
-            return std::min(tabEntries, MaxTabsPerRow);
+            return std::clamp(tabEntries, 1, MaxTabsPerRow);
         }
 
         void PrepareWidgets()