diff --git a/renderdoc/driver/d3d12/d3d12_common.cpp b/renderdoc/driver/d3d12/d3d12_common.cpp
index 44ee2300a..38a2a7314 100644
--- a/renderdoc/driver/d3d12/d3d12_common.cpp
+++ b/renderdoc/driver/d3d12/d3d12_common.cpp
@@ -209,7 +209,9 @@ void Serialiser::Serialise(const char *name, D3D12_SHADER_BYTECODE &el)
     el.pShaderBytecode = NULL;
     el.BytecodeLength = sz;
   }
-  SerialiseBuffer("pShaderBytecode", (byte *&)el.pShaderBytecode, sz);
+
+  if(dataSize > 0)
+    SerialiseBuffer("pShaderBytecode", (byte *&)el.pShaderBytecode, sz);
 }
 
 template <>