diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp
index 782077b9a24a7fa20f60b0f7b08b8e0788676a0d..8f778711ce9298a8bdfa15b8ea3a88413b566d54 100644
--- a/indra/newview/llenvironment.cpp
+++ b/indra/newview/llenvironment.cpp
@@ -2532,7 +2532,9 @@ void LLEnvironment::DayInstance::setWater(const LLSettingsWater::ptr_t &pwater)
     mType = TYPE_FIXED;
     mInitialized = false;
 
+    bool different_water = mWater != pwater;
     mWater = pwater;
+    mWater->mReplaced |= different_water;
     mWater->update();
     mBlenderWater.reset();
 }