diff --git a/.pick_status.json b/.pick_status.json
index 600f32f68b5..fffc404ff2b 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1066,7 +1066,7 @@
         "description": "nir/opt_if: fix opt_if_merge when destination branch has a jump",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "4d3f6cb9739dfeaf9605fcd2f5318e03acf5066e"
     },
diff --git a/src/compiler/nir/nir_opt_if.c b/src/compiler/nir/nir_opt_if.c
index a7feac1db93..4a255201318 100644
--- a/src/compiler/nir/nir_opt_if.c
+++ b/src/compiler/nir/nir_opt_if.c
@@ -1274,6 +1274,13 @@ opt_if_merge(nir_if *nif)
          if (nif->condition.ssa == next_if->condition.ssa &&
              exec_list_is_empty(&next_blk->instr_list)) {
 
+            /* This optimization isn't made to work in this case and
+             * opt_if_evaluate_condition_use will optimize it later.
+             */
+            if (nir_block_ends_in_jump(nir_if_last_then_block(nif)) ||
+                nir_block_ends_in_jump(nir_if_last_else_block(nif)))
+               return false;
+
             simple_merge_if(nif, next_if, true, true);
             simple_merge_if(nif, next_if, false, false);