diff --git a/renderdoc/driver/vulkan/wrappers/vk_descriptor_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_descriptor_funcs.cpp
index 71c95bab5..44a4b3b52 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_descriptor_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_descriptor_funcs.cpp
@@ -1113,6 +1113,11 @@ void WrappedVulkan::vkUpdateDescriptorSets(VkDevice device, uint32_t writeCount,
           bufInfos[j].buffer = Unwrap(pDescriptorWrites[i].pBufferInfo[j].buffer);
           bufInfos[j].offset = pDescriptorWrites[i].pBufferInfo[j].offset;
           bufInfos[j].range = pDescriptorWrites[i].pBufferInfo[j].range;
+          if(bufInfos[j].buffer == VK_NULL_HANDLE)
+          {
+            bufInfos[j].offset = 0;
+            bufInfos[j].range = VK_WHOLE_SIZE;
+          }
         }
       }
     }