diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index 59958523b..f07bcf110 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -170,7 +170,7 @@ static bool handleRenderPerfTestChanged(const LLSD& newvalue)
                                                                          LLPipeline::RENDER_TYPE_CLASSIC_CLOUDS,
                                                                          LLPipeline::RENDER_TYPE_HUD_PARTICLES,
                                                                          LLPipeline::END_RENDER_TYPES); 
-               gPipeline.setRenderDebugFeatureControl(LLPipeline::RENDER_DEBUG_FEATURE_UI, false);
+               gPipeline.setRenderDebugFeatureControl(~(U32)0, false);	// Reset all RENDER_DEBUG_FEATURE_* flags.
        }
        else 
        {
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 311d21c0b..508b8bb2c 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -5951,7 +5951,7 @@ void LLPipeline::setRenderDebugFeatureControl(U32 bit, bool value)
 	}
 	else
 	{
-		gPipeline.mRenderDebugFeatureMask &= !bit;
+		gPipeline.mRenderDebugFeatureMask &= ~bit;
 	}
 }