diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index e91ceb873ee2eadafdc1a9de7c918eadc5cc564f..6a3f1865316fc5992809049e348e91b242e60c94 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -184,8 +184,7 @@ void LLTexUnit::enable(eTextureType type)
 		mCurrTexType = type;
 
 		gGL.flush();
-		if (LLGLSLShader::sCurBoundShader == 0 &&
-			type != LLTexUnit::TT_MULTISAMPLE_TEXTURE &&
+		if (type != LLTexUnit::TT_MULTISAMPLE_TEXTURE &&
 			mIndex < gGLManager.mNumTextureUnits)
 		{
 			glEnable(sGLTextureType[type]);
@@ -202,7 +201,7 @@ void LLTexUnit::disable(void)
 		activate();
 		unbind(mCurrTexType);
 		gGL.flush();
-		if (LLGLSLShader::sCurBoundShader == 0 && mCurrTexType != LLTexUnit::TT_MULTISAMPLE_TEXTURE &&
+		if (mCurrTexType != LLTexUnit::TT_MULTISAMPLE_TEXTURE &&
 			mIndex < gGLManager.mNumTextureUnits)
 		{
 			glDisable(sGLTextureType[mCurrTexType]);