diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
index 2b2de806f..75b2170fb 100644
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -599,6 +599,7 @@ void LLViewerShaderMgr::setShaders()
 	LLWaterParamManager::getInstance()->updateShaderLinks();
 	LLWLParamManager::getInstance()->updateShaderLinks();
 
+	gPipeline.refreshCachedSettings();
 	gPipeline.createGLBuffers();
 
 	reentrance = false;