diff --git a/renderdoc/driver/d3d11/d3d11_device.cpp b/renderdoc/driver/d3d11/d3d11_device.cpp
index 635332e50..d99b6aff8 100644
--- a/renderdoc/driver/d3d11/d3d11_device.cpp
+++ b/renderdoc/driver/d3d11/d3d11_device.cpp
@@ -330,6 +330,11 @@ WrappedID3D11Device::~WrappedID3D11Device()
     RDCASSERT(WrappedID3D11Texture3D1::m_TextureList.empty());
   }
 
+  WrappedID3D11Buffer::m_BufferList.clear();
+  WrappedID3D11Texture1D::m_TextureList.clear();
+  WrappedID3D11Texture2D1::m_TextureList.clear();
+  WrappedID3D11Texture3D1::m_TextureList.clear();
+
   SAFE_DELETE(m_Replay);
 
   SAFE_RELEASE(m_ReplayNVAPI);