diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 4b84744e4..fe5f08b2f 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -4344,6 +4344,21 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
 	image_width *= internal_scale;
 #endif //shy_mod
 
+	//Hack until hud ui works in high-res shots again (nameplates and hud attachments are buggered).
+	if ((image_width > window_width || image_height > window_height))
+	{
+		if(LLPipeline::sShowHUDAttachments)
+		{
+			hide_hud=true;
+			LLPipeline::sShowHUDAttachments = FALSE;
+		}
+		if(show_ui)
+		{
+			show_ui=false;
+			LLPipeline::toggleRenderDebugFeature((void*)LLPipeline::RENDER_DEBUG_FEATURE_UI);
+		}
+	}
+	
 	if(!keep_window_aspect) //image cropping
 	{		
 		F32 ratio = llmin( (F32)window_width / image_width , (F32)window_height / image_height) ;
@@ -4535,7 +4550,7 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
 	gDepthDirty = TRUE;
 
 	// POST SNAPSHOT
-	if (!gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI))
+	if (prev_draw_ui != gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI))
 	{
 		LLPipeline::toggleRenderDebugFeature((void*)LLPipeline::RENDER_DEBUG_FEATURE_UI);
 	}
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 26212e34a..e329e4560 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -4848,6 +4848,7 @@ void LLPipeline::enableLightsFullbright(const LLColor4& color)
 void LLPipeline::disableLights()
 {
 	enableLights(0); // no lighting (full bright)
+	glColor4f(1.f, 1.f, 1.f, 1.f);
 }
 
 //============================================================================