diff --git a/src/panfrost/bifrost/bifrost_compile.c b/src/panfrost/bifrost/bifrost_compile.c
index 0c3e27d7994..2a696137c9a 100644
--- a/src/panfrost/bifrost/bifrost_compile.c
+++ b/src/panfrost/bifrost/bifrost_compile.c
@@ -1822,10 +1822,8 @@ bi_emit_intrinsic(bi_builder *b, nir_intrinsic_instr *instr)
 
         case nir_intrinsic_load_work_dim:
         case nir_intrinsic_load_num_vertices:
-                bi_load_sysval_nir(b, instr, 1, 0);
-                break;
-
         case nir_intrinsic_load_first_vertex:
+        case nir_intrinsic_load_draw_id:
                 bi_load_sysval_nir(b, instr, 1, 0);
                 break;
 
@@ -1834,13 +1832,6 @@ bi_emit_intrinsic(bi_builder *b, nir_intrinsic_instr *instr)
                 break;
 
         case nir_intrinsic_load_base_instance:
-                bi_load_sysval_nir(b, instr, 1, 8);
-                break;
-
-        case nir_intrinsic_load_draw_id:
-                bi_load_sysval_nir(b, instr, 1, 0);
-                break;
-
         case nir_intrinsic_get_ssbo_size:
                 bi_load_sysval_nir(b, instr, 1, 8);
                 break;