diff --git a/.pick_status.json b/.pick_status.json
index 727b532ea7d..12ed6dea203 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2074,7 +2074,7 @@
         "description": "broadcom/compiler: needs_quad_helper_invocation enable PER_QUAD TMU access",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/broadcom/compiler/nir_to_vir.c b/src/broadcom/compiler/nir_to_vir.c
index b0c9c65aae6..7f90d036b80 100644
--- a/src/broadcom/compiler/nir_to_vir.c
+++ b/src/broadcom/compiler/nir_to_vir.c
@@ -656,6 +656,8 @@ ntq_emit_tmu_general(struct v3d_compile *c, nir_intrinsic_instr *instr,
                          */
                         uint32_t perquad =
                                 is_load && !vir_in_nonuniform_control_flow(c) &&
+                                c->s->info.stage == MESA_SHADER_FRAGMENT &&
+                                c->s->info.fs.needs_quad_helper_invocations &&
                                 !c->emitted_discard ?
                                 GENERAL_TMU_LOOKUP_PER_QUAD :
                                 GENERAL_TMU_LOOKUP_PER_PIXEL;