Index: source/simulation2/components/CCmpWaterManager.cpp
===================================================================
--- source/simulation2/components/CCmpWaterManager.cpp
+++ source/simulation2/components/CCmpWaterManager.cpp
@@ -67,6 +67,10 @@
 		Init(paramNode);
 
 		deserialize.NumberFixed_Unbounded("height", m_WaterHeight);
+
+		// Only update the water height if it differs from the inital setting of the map
+		if (m_WaterHeight.ToFloat() != g_Renderer.GetWaterManager()->m_WaterHeight)
+			RecomputeWaterData();
 	}
 
 	virtual void HandleMessage(const CMessage& msg, bool UNUSED(global))