diff --git a/src/asahi/compiler/agx_pack.c b/src/asahi/compiler/agx_pack.c
index 2f1c3c663f3..e46f238f4e6 100644
--- a/src/asahi/compiler/agx_pack.c
+++ b/src/asahi/compiler/agx_pack.c
@@ -984,9 +984,13 @@ agx_pack_binary(agx_context *ctx, struct util_dynarray *emission)
    struct util_dynarray fixups;
    util_dynarray_init(&fixups, ctx);
 
-   agx_foreach_instr_global_safe(ctx, I) {
-      if (I->op == AGX_OPCODE_LOGICAL_END)
-         agx_remove_instruction(I);
+   agx_foreach_block(ctx, block) {
+      agx_foreach_instr_in_block_rev(block, I) {
+         if (I->op == AGX_OPCODE_LOGICAL_END) {
+            agx_remove_instruction(I);
+            break;
+         }
+      }
    }
 
    agx_foreach_block(ctx, block) {