diff --git a/renderdoc/driver/vulkan/vk_shader_feedback.cpp b/renderdoc/driver/vulkan/vk_shader_feedback.cpp
index ffe89470f..7a4995acb 100644
--- a/renderdoc/driver/vulkan/vk_shader_feedback.cpp
+++ b/renderdoc/driver/vulkan/vk_shader_feedback.cpp
@@ -798,10 +798,13 @@ void AnnotateShader(const ShaderReflection &refl, const SPIRVPatchData &patchDat
     while(it.opcode() == rdcspv::Op::Variable)
       ++it;
 
-    for(const rdcspv::Operation &op : locationGather)
+    if(funcId == entryID)
     {
-      editor.AddOperation(it, op);
-      ++it;
+      for(const rdcspv::Operation &op : locationGather)
+      {
+        editor.AddOperation(it, op);
+        ++it;
+      }
     }
 
     // now patch accesses in the function body