diff --git a/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp
index de7087bae..ed633e59b 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp
@@ -997,7 +997,12 @@ bool WrappedVulkan::Serialise_vkEndCommandBuffer(SerialiserType &ser, VkCommandB
 
             if(barrier.oldLayout != barrier.newLayout &&
                barrier.newLayout != VK_IMAGE_LAYOUT_UNDEFINED)
+            {
+              SanitiseOldImageLayout(barrier.oldLayout);
+              SanitiseNewImageLayout(barrier.newLayout);
+
               revertBarriers.push_back(barrier);
+            }
           }
 
           if(!revertBarriers.empty())