diff --git a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp
index 00fa3692f..fa4b39df3 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp
@@ -3438,14 +3438,6 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi
         CHECK_PHYS_EXT_FEATURE(rayTracingPipelineTraceRaysIndirect);
         CHECK_PHYS_EXT_FEATURE(rayTraversalPrimitiveCulling);
 
-        VkPhysicalDeviceRayTracingPipelinePropertiesKHR rayProps = {
-            VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PIPELINE_PROPERTIES_KHR,
-        };
-
-        VkPhysicalDeviceProperties2 availPropsBase = {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2};
-        availPropsBase.pNext = &rayProps;
-        ObjDisp(physicalDevice)->GetPhysicalDeviceProperties2(Unwrap(physicalDevice), &availPropsBase);
-
         if(ext->rayTracingPipeline && !avail.rayTracingPipelineShaderGroupHandleCaptureReplay)
         {
           SET_ERROR_RESULT(m_FailedReplayResult, ResultCode::APIHardwareUnsupported,
@@ -3498,6 +3490,29 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi
         CHECK_PHYS_EXT_FEATURE(imageCompressionControlSwapchain);
       }
       END_PHYS_EXT_CHECK();
+
+      BEGIN_PHYS_EXT_CHECK(VkPhysicalDeviceDescriptorBufferFeaturesEXT,
+                           VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_FEATURES_EXT);
+      {
+        CHECK_PHYS_EXT_FEATURE(descriptorBuffer);
+        CHECK_PHYS_EXT_FEATURE(descriptorBufferCaptureReplay);
+        CHECK_PHYS_EXT_FEATURE(descriptorBufferImageLayoutIgnored);
+        CHECK_PHYS_EXT_FEATURE(descriptorBufferPushDescriptors);
+
+        if(ext->descriptorBuffer && !avail.descriptorBufferCaptureReplay)
+        {
+          SET_ERROR_RESULT(m_FailedReplayResult, ResultCode::APIHardwareUnsupported,
+                           "Capture requires descriptorBuffer support, which is available, but "
+                           "descriptorBufferCaptureReplay support is not "
+                           "available which is required to replay\n"
+                           "\n%s",
+                           GetPhysDeviceCompatString(false, false).c_str());
+          return false;
+        }
+        if(ext->descriptorBuffer)
+          ext->descriptorBufferCaptureReplay = VK_TRUE;
+      }
+      END_PHYS_EXT_CHECK();
     }
 
     if(availFeatures.depthClamp)
@@ -4566,6 +4581,14 @@ VkResult WrappedVulkan::vkCreateDevice(VkPhysicalDevice physicalDevice,
     rtpFeatures->rayTracingPipelineShaderGroupHandleCaptureReplay = VK_TRUE;
   }
 
+  VkPhysicalDeviceDescriptorBufferFeaturesEXT *descBufFeatures =
+      (VkPhysicalDeviceDescriptorBufferFeaturesEXT *)FindNextStruct(
+          &createInfo, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_FEATURES_EXT);
+  if(descBufFeatures && descBufFeatures->descriptorBuffer)
+  {
+    descBufFeatures->descriptorBufferCaptureReplay = VK_TRUE;
+  }
+
   VkResult ret;
   SERIALISE_TIME_CALL(ret = createFunc(Unwrap(physicalDevice), &createInfo, NULL, pDevice));