diff --git a/.pick_status.json b/.pick_status.json
index da407eae634..ca4b20119bf 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -134,7 +134,7 @@
         "description": "broadcom/compiler: handle moving last ubo load in the block correctly",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "8998666de7e827f5fe62b51186c7f81d362a2be1",
         "notes": null
diff --git a/src/broadcom/compiler/vir.c b/src/broadcom/compiler/vir.c
index 96bcb956ad8..08c7d06afd9 100644
--- a/src/broadcom/compiler/vir.c
+++ b/src/broadcom/compiler/vir.c
@@ -1541,6 +1541,10 @@ v3d_nir_sort_constant_ubo_load(nir_block *block, nir_intrinsic_instr *ref)
                         exec_node_insert_after(&pos->node, &inst->node);
 
                 progress = true;
+
+                /* If this was the last instruction in the block we are done */
+                if (!next_inst)
+                        break;
         }
 
         return progress;