diff --git a/validator/src/aggregation/tendermint/protocol.rs b/validator/src/aggregation/tendermint/protocol.rs
index ed89f717d3..be104a747a 100644
--- a/validator/src/aggregation/tendermint/protocol.rs
+++ b/validator/src/aggregation/tendermint/protocol.rs
@@ -42,9 +42,14 @@ impl TendermintAggregationProtocol {
             Arc::clone(&registry),
             Arc::clone(&partitioner),
             |aggregate: &TendermintContribution, _, _| {
-                aggregate.proposals().iter().any(|(_, contributor_count)| {
-                    *contributor_count >= Policy::TWO_F_PLUS_ONE as usize
-                })
+                let t = aggregate.all_contributors().len() == Policy::SLOTS as usize;
+                let t = t || aggregate.contributions.iter().any(|(_hash_option, contributor_count)| {
+                    contributor_count.signers.len() >= Policy::TWO_F_PLUS_ONE as usize
+                });
+                if t {
+                    log::warn!(?aggregate, "Encountered final aggregate");
+                }
+                t
             },
         ));