diff --git a/renderdoc/driver/shaders/dxil/dxil_debug.cpp b/renderdoc/driver/shaders/dxil/dxil_debug.cpp
index e225b3e38..c155270ae 100644
--- a/renderdoc/driver/shaders/dxil/dxil_debug.cpp
+++ b/renderdoc/driver/shaders/dxil/dxil_debug.cpp
@@ -8229,6 +8229,10 @@ const TypeData &Debugger::AddDebugType(const DXIL::Metadata *typeMD)
             AddDebugType(compositeType->base);
             typeData.baseType = compositeType->base;
           }
+          else
+          {
+            typeData.baseType = typeMD;
+          }
           break;
         }
         default: