diff --git a/src/panfrost/bifrost/bi_pack.c b/src/panfrost/bifrost/bi_pack.c
index 324a0e9762b..6302b6cd728 100644
--- a/src/panfrost/bifrost/bi_pack.c
+++ b/src/panfrost/bifrost/bi_pack.c
@@ -38,8 +38,8 @@ bi_pack_header(bi_clause *clause, bi_clause *next_1, bi_clause *next_2, bool tdd
 
         struct bifrost_header header = {
                 .flow_control =
-                        (next_1 == NULL) ? BIFROST_FLOW_END :
-                        clause->flow_control,
+                        (next_1 == NULL && next_2 == NULL) ?
+                        BIFROST_FLOW_END :  clause->flow_control,
                 .terminate_discarded_threads = tdd,
                 .next_clause_prefetch = clause->next_clause_prefetch && next_1,
                 .staging_barrier = clause->staging_barrier,