diff --git a/binaries/data/mods/public/maps/random/island_stronghold.js b/binaries/data/mods/public/maps/random/island_stronghold.js
index e844720625..935478de90 100644
--- a/binaries/data/mods/public/maps/random/island_stronghold.js
+++ b/binaries/data/mods/public/maps/random/island_stronghold.js
@@ -595,7 +595,7 @@ createObjectGroups(group, 0,
 );
 
 paintTerrainBasedOnHeight(1, 2, 0, tShore);
-paintTerrainBasedOnHeight(-8, 1, 2, tWater);
+paintTerrainBasedOnHeight(getMapBaseHeight(), 1, 3, tWater);
 
 setSkySet(shuffleArray(["cloudless", "cumulus", "overcast"])[0]);
 
diff --git a/binaries/data/mods/public/maps/random/rmgen/library.js b/binaries/data/mods/public/maps/random/rmgen/library.js
index c372b067dd..3eda642956 100644
--- a/binaries/data/mods/public/maps/random/rmgen/library.js
+++ b/binaries/data/mods/public/maps/random/rmgen/library.js
@@ -290,6 +290,11 @@ function isCircularMap()
 	return !!g_MapSettings.CircularMap;
 }
 
+function getMapBaseHeight()
+{
+	return g_MapSettings.BaseHeight || 0;
+}
+
 function createTileClass()
 {
 	return g_Map.createTileClass();