diff --git a/src/asahi/vulkan/hk_cmd_draw.c b/src/asahi/vulkan/hk_cmd_draw.c
index 5a63d24c9ea..482d4980c19 100644
--- a/src/asahi/vulkan/hk_cmd_draw.c
+++ b/src/asahi/vulkan/hk_cmd_draw.c
@@ -2670,7 +2670,9 @@ hk_flush_dynamic_state(struct hk_cmd_buffer *cmd, struct hk_cs *cs,
             (dev->vk.enabled_features.robustBufferAccess2 ||
              dev->vk.enabled_features.pipelineRobustness)
                ? AGX_ROBUSTNESS_D3D
-               : AGX_ROBUSTNESS_GL,
+            : dev->vk.enabled_features.robustBufferAccess
+               ? AGX_ROBUSTNESS_GL
+               : AGX_ROBUSTNESS_DISABLED,
 
          .prolog.robustness.soft_fault = agx_has_soft_fault(&dev->dev),
       };