diff --git a/offchain/advance-runner/src/broker.rs b/offchain/advance-runner/src/broker.rs
index 1993b6e19..51c5570c6 100644
--- a/offchain/advance-runner/src/broker.rs
+++ b/offchain/advance-runner/src/broker.rs
@@ -111,6 +111,8 @@ impl BrokerFacade {
             Some(event) => {
                 tracing::trace!(?event, "got last claim produced");
                 rollups_claim.epoch_index <= event.payload.epoch_index
+                    || rollups_claim.first_index != event.payload.last_index + 1
+                    || rollups_claim.last_index < event.payload.last_index
             }
             None => {
                 tracing::trace!("no claims in the stream");