diff --git a/.pick_status.json b/.pick_status.json
index 1fe7dd70e34..4f846163eed 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -964,7 +964,7 @@
         "description": "aco/post-ra: track pseudo scratch sgpr/scc clobber",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/amd/compiler/aco_optimizer_postRA.cpp b/src/amd/compiler/aco_optimizer_postRA.cpp
index e56c36e0cce..93fc261a259 100644
--- a/src/amd/compiler/aco_optimizer_postRA.cpp
+++ b/src/amd/compiler/aco_optimizer_postRA.cpp
@@ -157,6 +157,12 @@ save_reg_writes(pr_opt_ctx& ctx, aco_ptr<Instruction>& instr)
       std::fill(ctx.instr_idx_by_regs[ctx.current_block->index].begin() + r,
                 ctx.instr_idx_by_regs[ctx.current_block->index].begin() + r + dw_size, idx);
    }
+   if (instr->isPseudo() && instr->pseudo().needs_scratch_reg) {
+      if (!instr->pseudo().tmp_in_scc)
+         ctx.instr_idx_by_regs[ctx.current_block->index][scc] = overwritten_unknown_instr;
+      ctx.instr_idx_by_regs[ctx.current_block->index][instr->pseudo().scratch_sgpr] =
+         overwritten_unknown_instr;
+   }
 }
 
 Idx