diff --git a/renderdoc/driver/shaders/spirv/spirv_debug_setup.cpp b/renderdoc/driver/shaders/spirv/spirv_debug_setup.cpp
index 00d04b162..06ff3cf7c 100644
--- a/renderdoc/driver/shaders/spirv/spirv_debug_setup.cpp
+++ b/renderdoc/driver/shaders/spirv/spirv_debug_setup.cpp
@@ -1746,6 +1746,10 @@ void Debugger::FillDebugSourceVars(rdcarray<InstructionSourceInfo> &instInfo)
             usage->type = scalar.type;
             columns = RDCMAX(1U, typeWalk->vecSize);
           }
+          else
+          {
+            usage->type = typeWalk->type;
+          }
 
           usage->debugVar = mapping.debugVar;
           // Remove any child mappings : this mapping covers everything