diff --git a/renderdoc/replay/replay_output.cpp b/renderdoc/replay/replay_output.cpp
index 09e8fe0a2..9fb471d43 100644
--- a/renderdoc/replay/replay_output.cpp
+++ b/renderdoc/replay/replay_output.cpp
@@ -234,6 +234,7 @@ bool ReplayOutput::SetPixelContext(void *wnd)
 
 bool ReplayOutput::AddThumbnail(void *wnd, ResourceId texID)
 {
+	/*
 	OutputPair p;
 
 	RDCASSERT(wnd);
@@ -272,7 +273,7 @@ bool ReplayOutput::AddThumbnail(void *wnd, ResourceId texID)
 	RDCASSERT(p.outputID > 0);
 
 	m_Thumbnails.push_back(p);
-
+	*/
 	return true;
 }
 
diff --git a/renderdocui/Windows/TextureViewer.cs b/renderdocui/Windows/TextureViewer.cs
index ec5ce39aa..1d34adbcd 100644
--- a/renderdocui/Windows/TextureViewer.cs
+++ b/renderdocui/Windows/TextureViewer.cs
@@ -976,7 +976,7 @@ namespace renderdocui.Windows
             m_Core.Renderer.BeginInvoke((ReplayRenderer r) =>
             {
                 m_Output = r.CreateOutput(renderHandle);
-                m_Output.SetPixelContext(contextHandle);
+                //m_Output.SetPixelContext(contextHandle);
                 m_Output.SetOutputConfig(outConfig);
 
                 this.BeginInvoke(new Action(UI_CreateThumbnails));