diff --git a/src/compiler/nir/nir_opt_if.c b/src/compiler/nir/nir_opt_if.c
index 8b35b167013..9bcc7712e1a 100644
--- a/src/compiler/nir/nir_opt_if.c
+++ b/src/compiler/nir/nir_opt_if.c
@@ -1273,6 +1273,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);