diff --git a/.pick_status.json b/.pick_status.json
index 95279670e8b..d4fdcf46f1a 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -103,7 +103,7 @@
         "description": "aco: don't create v_madmk_f32/v_madak_f32 from v_fma_legacy_f16",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/amd/compiler/aco_optimizer.cpp b/src/amd/compiler/aco_optimizer.cpp
index eb2eea64ed2..be0e2a96f8a 100644
--- a/src/amd/compiler/aco_optimizer.cpp
+++ b/src/amd/compiler/aco_optimizer.cpp
@@ -3439,6 +3439,11 @@ void select_instruction(opt_ctx &ctx, aco_ptr<Instruction>& instr)
          if ((instr->opcode == aco_opcode::v_fma_f32 || instr->opcode == aco_opcode::v_fma_f16) &&
              ctx.program->chip_class < GFX10)
             return;
+         /* There are no v_fmaak_legacy_f16/v_fmamk_legacy_f16 and on chips where VOP3 can take
+          * literals (GFX10+), these instructions don't exist.
+          */
+         if (instr->opcode == aco_opcode::v_fma_legacy_f16)
+            return;
 
          bool sgpr_used = false;
          uint32_t literal_idx = 0;