diff --git a/.pick_status.json b/.pick_status.json
index 36e4e8f82e0..ea725c4b0b5 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -714,7 +714,7 @@
         "description": "aco/gfx11+: limit hard clauses to 32 instructions",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/amd/compiler/aco_form_hard_clauses.cpp b/src/amd/compiler/aco_form_hard_clauses.cpp
index 90ace0b9fb8..66f0ded6f8d 100644
--- a/src/amd/compiler/aco_form_hard_clauses.cpp
+++ b/src/amd/compiler/aco_form_hard_clauses.cpp
@@ -248,6 +248,10 @@ get_type(Program* program, aco_ptr<Instruction>& instr)
 void
 form_hard_clauses(Program* program)
 {
+   /* The ISA documentation says 63 is the maximum for GFX11/12, but according to
+    * LLVM there are HW bugs with more than 32 instructions.
+    */
+   const unsigned max_clause_length = program->gfx_level >= GFX11 ? 32 : 63;
    for (Block& block : program->blocks) {
       unsigned num_instrs = 0;
       aco_ptr<Instruction> current_instrs[63];
@@ -261,7 +265,7 @@ form_hard_clauses(Program* program)
          aco_ptr<Instruction>& instr = block.instructions[i];
 
          clause_type type = get_type(program, instr);
-         if (type != current_type || num_instrs == 63 ||
+         if (type != current_type || num_instrs == max_clause_length ||
              (num_instrs && !should_form_clause(current_instrs[0].get(), instr.get()))) {
             emit_clause(bld, num_instrs, current_instrs);
             num_instrs = 0;