diff --git a/src/compiler/nir/nir_intrinsics.py b/src/compiler/nir/nir_intrinsics.py
index 08292cee484..34926e4582d 100644
--- a/src/compiler/nir/nir_intrinsics.py
+++ b/src/compiler/nir/nir_intrinsics.py
@@ -1807,7 +1807,7 @@ system_value("idvs_output_buf_index_pan", 1, bit_sizes=[32])
 
 # src[] = { handle, vertex_id, instance_id }
 intrinsic("lea_attr_pan", [1, 1, 1], dest_comp=3, bit_sizes=[32],
-          indices=[SRC_TYPE], flags=[CAN_ELIMINATE, CAN_REORDER])
+          indices=[SRC_TYPE, DESC_SET], flags=[CAN_ELIMINATE, CAN_REORDER])
 
 # src[] = { handle, index }
 intrinsic("lea_buf_pan", [1, 1], dest_comp=2, bit_sizes=[32],
diff --git a/src/panfrost/compiler/bifrost/bifrost_compile.c b/src/panfrost/compiler/bifrost/bifrost_compile.c
index 5b6cde93bca..fd1db342402 100644
--- a/src/panfrost/compiler/bifrost/bifrost_compile.c
+++ b/src/panfrost/compiler/bifrost/bifrost_compile.c
@@ -545,7 +545,10 @@ bi_emit_lea_attr(bi_builder *b, nir_intrinsic_instr *intr)
    assert(intr->intrinsic == nir_intrinsic_lea_attr_pan);
    const nir_alu_type src_fmt = nir_intrinsic_src_type(intr);
 
-   if (b->shader->arch < 9 && b->shader->idvs == BI_IDVS_POSITION) {
+   if (b->shader->arch < 9 &&
+       b->shader->idvs == BI_IDVS_POSITION &&
+       nir_intrinsic_desc_set(intr) == BI_TABLE_NONE &&
+       nir_src_is_zero(intr->src[0])) {
       /* Bifrost position shaders have a fast path */
       assert(nir_src_is_zero(intr->src[0]));
       assert(src_fmt == nir_type_float32);
@@ -562,7 +565,9 @@ bi_emit_lea_attr(bi_builder *b, nir_intrinsic_instr *intr)
 
    bi_index vertex_id = bi_src_index(&intr->src[1]);
    bi_index instance_id = bi_src_index(&intr->src[2]);
-   enum bi_register_format regfmt = bi_reg_fmt_for_nir(src_fmt);
+   enum bi_register_format regfmt =
+      src_fmt == 32 ? BI_REGISTER_FORMAT_AUTO
+                    : bi_reg_fmt_for_nir(src_fmt);
 
    /* Check if the index can fit in LEA_ATTR_IMM */
    uint32_t imm_res = 0;
@@ -579,9 +584,14 @@ bi_emit_lea_attr(bi_builder *b, nir_intrinsic_instr *intr)
                                        pan_res_handle_get_index(imm_res));
       if (b->shader->arch >= 9)
          I->table = va_res_fold_table_idx(pan_res_handle_get_table(imm_res));
+      else
+         I->table = nir_intrinsic_desc_set(intr);
    } else {
       bi_index res = bi_src_index(&intr->src[0]);
-      bi_lea_attr_to(b, address, vertex_id, instance_id, res, regfmt);
+      bi_instr *I = bi_lea_attr_to(b, address, vertex_id, instance_id, res,
+                                   regfmt);
+      if (b->shader->arch < 9)
+         I->table = nir_intrinsic_desc_set(intr);
    }
    bi_split_def(b, &intr->def);
 }