diff --git a/renderdoc/driver/vulkan/vk_initstate.cpp b/renderdoc/driver/vulkan/vk_initstate.cpp
index b74f49c22..8764139d9 100644
--- a/renderdoc/driver/vulkan/vk_initstate.cpp
+++ b/renderdoc/driver/vulkan/vk_initstate.cpp
@@ -744,6 +744,11 @@ bool WrappedVulkan::Serialise_InitialState(SerialiserType &ser, ResourceId id,
 
       for(uint32_t j = 0; j < initialContents.numDescriptors; j++)
       {
+        uint32_t descriptorCount = layout.bindings[j].descriptorCount;
+
+        if(descriptorCount == 0)
+          continue;
+
         writes[bind].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
         writes[bind].pNext = NULL;
 
@@ -756,8 +761,6 @@ bool WrappedVulkan::Serialise_InitialState(SerialiserType &ser, ResourceId id,
         writes[bind].descriptorCount = 0;
         writes[bind].descriptorType = layout.bindings[j].descriptorType;
 
-        uint32_t descriptorCount = layout.bindings[j].descriptorCount;
-
         ResourceId *immutableSamplers = layout.bindings[j].immutableSampler;
 
         DescriptorSetSlot *src = srcData;