diff --git a/.pick_status.json b/.pick_status.json
index 18311e78937..9ed292a3f18 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -6044,7 +6044,7 @@
         "description": "radv: Only expose indirect raytracing on gfx7+",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/amd/vulkan/radv_physical_device.c b/src/amd/vulkan/radv_physical_device.c
index b7eb33c287d..40f40cc7921 100644
--- a/src/amd/vulkan/radv_physical_device.c
+++ b/src/amd/vulkan/radv_physical_device.c
@@ -1078,12 +1078,12 @@ radv_physical_device_get_features(const struct radv_physical_device *pdev, struc
       .rayTracingPipeline = true,
       .rayTracingPipelineShaderGroupHandleCaptureReplay = true,
       .rayTracingPipelineShaderGroupHandleCaptureReplayMixed = false,
-      .rayTracingPipelineTraceRaysIndirect = true,
+      .rayTracingPipelineTraceRaysIndirect = pdev->info.gfx_level >= GFX7,
       .rayTraversalPrimitiveCulling = true,
 
       /* VK_KHR_ray_tracing_maintenance1 */
       .rayTracingMaintenance1 = true,
-      .rayTracingPipelineTraceRaysIndirect2 = radv_enable_rt(pdev),
+      .rayTracingPipelineTraceRaysIndirect2 = radv_enable_rt(pdev) && pdev->info.gfx_level >= GFX7,
 
       /* VK_KHR_ray_tracing_position_fetch */
       .rayTracingPositionFetch = true,