diff --git a/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp
index 849974137..6d11da09d 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp
@@ -1149,7 +1149,7 @@ bool WrappedVulkan::Serialise_vkCreateImage(Serialiser *localSerialiser, VkDevic
         // of capability or because we disabled it as a workaround then we don't need this
         // capability (and it might be the bug we're trying to work around by disabling the
         // pipeline)
-        if(GetDebugManager()->m_MS2ArrayPipe)
+        if(GetDebugManager()->m_MS2ArrayPipe != VK_NULL_HANDLE)
           info.usage |= VK_IMAGE_USAGE_STORAGE_BIT;
       }
       else
@@ -1227,7 +1227,7 @@ VkResult WrappedVulkan::vkCreateImage(VkDevice device, const VkImageCreateInfo *
     {
       if(!IsDepthOrStencilFormat(createInfo_adjusted.format))
       {
-        if(GetDebugManager()->m_MS2ArrayPipe)
+        if(GetDebugManager()->m_MS2ArrayPipe != VK_NULL_HANDLE)
           createInfo_adjusted.usage |= VK_IMAGE_USAGE_STORAGE_BIT;
       }
       else