diff --git a/renderdoc/driver/d3d12/d3d12_outputwindow.cpp b/renderdoc/driver/d3d12/d3d12_outputwindow.cpp
index 345677448..c5cab33c1 100644
--- a/renderdoc/driver/d3d12/d3d12_outputwindow.cpp
+++ b/renderdoc/driver/d3d12/d3d12_outputwindow.cpp
@@ -210,6 +210,8 @@ void D3D12Replay::DestroyOutputWindow(uint64_t id)
 
   OutputWindow &outw = it->second;
 
+  m_pDevice->FlushLists(true);
+
   SAFE_RELEASE(outw.swap);
   SAFE_RELEASE(outw.bb[0]);
   SAFE_RELEASE(outw.bb[1]);