diff --git a/crates/storage/provider/src/providers/blockchain_provider.rs b/crates/storage/provider/src/providers/blockchain_provider.rs
index 47f502796fdc..824713c93e52 100644
--- a/crates/storage/provider/src/providers/blockchain_provider.rs
+++ b/crates/storage/provider/src/providers/blockchain_provider.rs
@@ -562,8 +562,8 @@ impl<N: ProviderNodeTypes> HeaderProvider for BlockchainProvider2<N> {
             range,
             |db_provider, range, predicate| db_provider.sealed_headers_while(range, predicate),
             |block_state, predicate| {
-                Some(block_state.block_ref().block().header.clone())
-                    .filter(|header| predicate(header))
+                let header = &block_state.block_ref().block().header;
+                predicate(header).then(|| header.clone())
             },
             predicate,
         )