diff --git a/.pick_status.json b/.pick_status.json
index c1f099aba20..8fef1f4028c 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -5044,7 +5044,7 @@
         "description": "aco/gfx12: fix VALUReadSGPRHazard with carry-out",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "65f95ae74e9c0e30bd14bfca347caeedce486bba",
         "notes": null
diff --git a/src/amd/compiler/aco_insert_NOPs.cpp b/src/amd/compiler/aco_insert_NOPs.cpp
index a2142444110..a964a1928d6 100644
--- a/src/amd/compiler/aco_insert_NOPs.cpp
+++ b/src/amd/compiler/aco_insert_NOPs.cpp
@@ -1618,9 +1618,9 @@ handle_instruction_gfx11(State& state, NOP_ctx_gfx11& ctx, aco_ptr<Instruction>&
       }
 
       if (instr->isVALU() && !instr->definitions.empty()) {
-         PhysReg reg = instr->definitions[0].physReg();
+         PhysReg reg = instr->definitions.back().physReg();
          if (reg < m0 && ctx.sgpr_read_by_valu[reg / 2]) {
-            for (unsigned i = 0; i < instr->definitions[0].size(); i++)
+            for (unsigned i = 0; i < instr->definitions.back().size(); i++)
                ctx.sgpr_read_by_valu_then_wr_by_valu.set(reg + i);
          }
       } else if (instr->isSALU() && !instr->definitions.empty()) {