diff --git a/renderdoc/driver/d3d11/d3d11_debug.cpp b/renderdoc/driver/d3d11/d3d11_debug.cpp
index 33243cc7a..1c082f783 100644
--- a/renderdoc/driver/d3d11/d3d11_debug.cpp
+++ b/renderdoc/driver/d3d11/d3d11_debug.cpp
@@ -155,6 +155,11 @@ void D3D11DebugManager::InitCommonResources()
   displayhlsl += GetEmbeddedResource(debugdisplay_hlsl);
 
   MSArrayCopyVS = shaderCache->MakeVShader(displayhlsl.c_str(), "RENDERDOC_FullscreenVS", "vs_4_0");
+
+  for(int i = 0; i < ARRAY_COUNT(PublicCBuffers); i++)
+    PublicCBuffers[i] = MakeCBuffer(sizeof(float) * 4 * 100);
+
+  publicCBufIdx = 0;
 }
 
 void D3D11DebugManager::InitReplayResources()
@@ -163,11 +168,6 @@ void D3D11DebugManager::InitReplayResources()
 
   HRESULT hr = S_OK;
 
-  for(int i = 0; i < ARRAY_COUNT(PublicCBuffers); i++)
-    PublicCBuffers[i] = MakeCBuffer(sizeof(float) * 4 * 100);
-
-  publicCBufIdx = 0;
-
   {
     std::string displayhlsl = GetEmbeddedResource(debugcbuffers_h);
     displayhlsl += GetEmbeddedResource(debugcommon_hlsl);