diff --git a/renderdocui/Code/Core.cs b/renderdocui/Code/Core.cs
index b2cd2539a..43ead7fed 100644
--- a/renderdocui/Code/Core.cs
+++ b/renderdocui/Code/Core.cs
@@ -667,7 +667,6 @@ namespace renderdocui.Code
             m_LogFile = "";
 
             m_Renderer.CloseThreadSync();
-            m_Renderer = new RenderManager();
 
             m_APIProperties = null;
             m_FrameInfo = null;
diff --git a/renderdocui/Code/RenderManager.cs b/renderdocui/Code/RenderManager.cs
index e5b7a4044..0cb17e1e5 100644
--- a/renderdocui/Code/RenderManager.cs
+++ b/renderdocui/Code/RenderManager.cs
@@ -174,7 +174,9 @@ namespace renderdocui.Code
         {
             Running = false;
 
-            while (m_Thread != null && m_Thread.IsAlive) ; 
+            while (m_Thread != null && m_Thread.IsAlive) ;
+
+            m_renderQueue = new List<InvokeHandle>();
         }
 
         public float LoadProgress;