diff --git a/src/imagination/vulkan/pvr_descriptor_set.c b/src/imagination/vulkan/pvr_descriptor_set.c
index a9ba0f4b42a..69d3984b5ba 100644
--- a/src/imagination/vulkan/pvr_descriptor_set.c
+++ b/src/imagination/vulkan/pvr_descriptor_set.c
@@ -893,6 +893,9 @@ VkResult pvr_CreatePipelineLayout(VkDevice _device,
             layout->descriptor_offsets[set_num][stage][type] =
                descriptor_counts[type];
 
+            if (!layout->set_layout[set_num]->descriptor_count)
+               continue;
+
             descriptor_count = layout->set_layout[set_num]
                                   ->per_stage_descriptor_count[stage][type];