diff --git a/.pick_status.json b/.pick_status.json
index ce0d3101e63..3da09bc422e 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2774,7 +2774,7 @@
         "description": "r600/sfn: When splitting an ALU CF update possible start of next CF",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "6aafa2bb4903db20269b3062dfa73b3fe781facd",
         "notes": null
diff --git a/src/gallium/drivers/r600/sfn/sfn_scheduler.cpp b/src/gallium/drivers/r600/sfn/sfn_scheduler.cpp
index 483f281f984..2a8eb6ace22 100644
--- a/src/gallium/drivers/r600/sfn/sfn_scheduler.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_scheduler.cpp
@@ -788,6 +788,7 @@ void BlockScheduler::maybe_split_alu_block(Shader::ShaderBlocks& out_blocks)
          next_block_start->set_instr_flag(Instr::force_cf);
          used_slots = pending_slots;
          pending_slots = cur_group->slots();
+         next_block_start = cur_group;
       }
    }