diff --git a/.pick_status.json b/.pick_status.json
index 11dd935c02e..c9f2e6fcebc 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4004,7 +4004,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 1ab54ec65e3..95d7e50e4cd 100644
--- a/meson.build
+++ b/meson.build
@@ -1723,7 +1723,7 @@ if with_clc
   # but we don't know what LLVM version we are using yet
   llvm_optional_modules += ['all-targets', 'windowsdriver', 'frontendhlsl', 'frontenddriver']
 endif
-draw_with_llvm = get_option('draw-use-llvm')
+draw_with_llvm = with_llvm.allowed() and get_option('draw-use-llvm')
 if draw_with_llvm
   llvm_modules += 'native'
   # lto is needded with LLVM>=15, but we don't know what LLVM verrsion we are using yet