diff --git a/renderdoc/driver/vulkan/vk_core.cpp b/renderdoc/driver/vulkan/vk_core.cpp
index 1dbc35b8f..9935696d5 100644
--- a/renderdoc/driver/vulkan/vk_core.cpp
+++ b/renderdoc/driver/vulkan/vk_core.cpp
@@ -3808,6 +3808,8 @@ void WrappedVulkan::AddUsage(VulkanDrawcallTreeNode &drawNode, rdcarray<DebugMes
   //////////////////////////////
   // Shaders
 
+  static bool hugeRangeWarned = false;
+
   for(int shad = 0; shad < 6; shad++)
   {
     bool compute = (shad == 5);
@@ -3910,6 +3912,14 @@ void WrappedVulkan::AddUsage(VulkanDrawcallTreeNode &drawNode, rdcarray<DebugMes
           continue;
         }
 
+        if(layout.bindings[bind].descriptorCount > 1000)
+        {
+          if(!hugeRangeWarned)
+            RDCWARN("Skipping large, most likely 'bindless', descriptor range");
+          hugeRangeWarned = true;
+          continue;
+        }
+
         for(uint32_t a = 0; a < layout.bindings[bind].descriptorCount; a++)
         {
           DescriptorSetSlot &slot = descset.currentBindings[bind][a];