diff --git a/renderdoc/driver/shaders/spirv/spirv_editor.h b/renderdoc/driver/shaders/spirv/spirv_editor.h
index 2fc337d4a..8b98e9dcf 100644
--- a/renderdoc/driver/shaders/spirv/spirv_editor.h
+++ b/renderdoc/driver/shaders/spirv/spirv_editor.h
@@ -359,7 +359,7 @@ class SPIRVEditor
 {
 public:
   SPIRVEditor(std::vector<uint32_t> &spirvWords);
-
+  ~SPIRVEditor() { StripNops(); }
   void StripNops();
 
   SPIRVId MakeId();
diff --git a/renderdoc/driver/vulkan/vk_postvs.cpp b/renderdoc/driver/vulkan/vk_postvs.cpp
index 39ac01081..13a2ab5c4 100644
--- a/renderdoc/driver/vulkan/vk_postvs.cpp
+++ b/renderdoc/driver/vulkan/vk_postvs.cpp
@@ -1117,8 +1117,6 @@ static void ConvertToMeshOutputCompute(const ShaderReflection &refl, const SPIRV
 
     editor.AddFunction(ops.data(), ops.size());
   }
-
-  editor.StripNops();
 }
 
 static void AddXFBAnnotations(const ShaderReflection &refl, const SPIRVPatchData &patchData,
@@ -1267,8 +1265,6 @@ static void AddXFBAnnotations(const ShaderReflection &refl, const SPIRVPatchData
       vars.insert(outpatch[i].ID);
     }
   }
-
-  editor.StripNops();
 }
 
 void VulkanReplay::ClearPostVSCache()