diff --git a/.pick_status.json b/.pick_status.json
index df97da62a2f..150594bf96d 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -5314,7 +5314,7 @@
         "description": "amd: require LLVM when amd-use-llvm is enabled",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "82047fa82f1bbbbd4f1a9b05c034f79a00d85e31",
         "notes": null
diff --git a/meson.build b/meson.build
index 54da4163f5e..502283fdd67 100644
--- a/meson.build
+++ b/meson.build
@@ -1736,7 +1736,7 @@ endif
 llvm_has_mcjit = host_machine.cpu_family() in ['aarch64', 'arm', 'ppc', 'ppc64', 's390x', 'x86', 'x86_64']
 llvm_with_orcjit = get_option('llvm-orcjit') or not llvm_has_mcjit
 
-if with_amd_vk or with_gallium_radeonsi
+if (with_amd_vk or with_gallium_radeonsi) and amd_with_llvm
   _llvm_version = '>= 18.0.0'
 elif with_clc or llvm_with_orcjit
   _llvm_version = '>= 15.0.0'