diff --git a/.pick_status.json b/.pick_status.json
index d0020e9e712..2f336d2715a 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -364,7 +364,7 @@
         "description": "llvmpipe: disable alpha test branch if multisample is enabled.",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.c b/src/gallium/drivers/llvmpipe/lp_state_fs.c
index 756e263b60c..fd82ca981e1 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_fs.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_fs.c
@@ -995,7 +995,7 @@ generate_fs_loop(struct gallivm_state *gallivm,
 
          lp_build_alpha_test(gallivm, key->alpha.func, type, cbuf_format_desc,
                              &mask, alpha, alpha_ref_value,
-                             (depth_mode & LATE_DEPTH_TEST) != 0);
+                             ((depth_mode & LATE_DEPTH_TEST) != 0) && !key->multisample);
       }
    }