diff --git a/renderdoc/driver/d3d12/d3d12_device.cpp b/renderdoc/driver/d3d12/d3d12_device.cpp
index ffefe1a60..2f9dd2331 100644
--- a/renderdoc/driver/d3d12/d3d12_device.cpp
+++ b/renderdoc/driver/d3d12/d3d12_device.cpp
@@ -537,7 +537,8 @@ void WrappedID3D12Device::ApplyInitialContents()
   GetResourceManager()->ApplyInitialContents();
 
   // close the final list
-  initStateCurList->Close();
+  if(initStateCurList)
+    initStateCurList->Close();
 
   initStateCurBatch = 0;
   initStateCurList = NULL;