diff --git a/renderdoc/driver/shaders/dxil/dxil_debug.cpp b/renderdoc/driver/shaders/dxil/dxil_debug.cpp
index 46f6e7cf4..732f407c5 100644
--- a/renderdoc/driver/shaders/dxil/dxil_debug.cpp
+++ b/renderdoc/driver/shaders/dxil/dxil_debug.cpp
@@ -6434,6 +6434,12 @@ ScopedDebugData *Debugger::AddScopedDebugData(const DXIL::Metadata *scopeMD)
 
 const TypeData &Debugger::AddDebugType(const DXIL::Metadata *typeMD)
 {
+  {
+    auto it = m_DebugInfo.types.find(typeMD);
+    if(it != m_DebugInfo.types.end())
+      return it->second;
+  }
+
   TypeData typeData;
 
   const DXIL::DIBase *base = typeMD->dwarf;