diff --git a/.pick_status.json b/.pick_status.json
index 4186ee9d319..95c458a63c0 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3314,7 +3314,7 @@
         "description": "meson: auto-disable `draw-use-llvm` when `llvm=disabled`",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/meson.build b/meson.build
index 5088b15d232..f85cd266e8c 100644
--- a/meson.build
+++ b/meson.build
@@ -218,7 +218,7 @@ with_gallium_ethosu = gallium_drivers.contains('ethosu')
 foreach gallium_driver : gallium_drivers
   pre_args += '-DHAVE_@0@'.format(gallium_driver.to_upper())
 endforeach
-draw_with_llvm = get_option('draw-use-llvm')
+draw_with_llvm = with_llvm.allowed() and get_option('draw-use-llvm')
 with_llvm = with_llvm \
   .enable_if(with_gallium_i915, error_message : 'i915 Gallium driver requires LLVM for vertex shaders') \
   .enable_if(with_gallium_llvmpipe, error_message : 'LLVMPipe Gallium driver requires LLVM') \