diff --git a/ethereum/statetransition/src/main/java/tech/pegasys/teku/statetransition/util/BlockBlobSidecarsTrackersPoolImpl.java b/ethereum/statetransition/src/main/java/tech/pegasys/teku/statetransition/util/BlockBlobSidecarsTrackersPoolImpl.java
index f68ca13ac73..652e5fc9607 100644
--- a/ethereum/statetransition/src/main/java/tech/pegasys/teku/statetransition/util/BlockBlobSidecarsTrackersPoolImpl.java
+++ b/ethereum/statetransition/src/main/java/tech/pegasys/teku/statetransition/util/BlockBlobSidecarsTrackersPoolImpl.java
@@ -324,7 +324,7 @@ public synchronized void onCompletedBlockAndBlobSidecars(
 
     long addedBlobs =
         blobSidecars.stream()
-            .map(
+            .filter(
                 blobSidecar -> {
                   final boolean isNew = blobSidecarsTracker.add(blobSidecar);
                   if (isNew) {
@@ -333,7 +333,6 @@ public synchronized void onCompletedBlockAndBlobSidecars(
                   }
                   return isNew;
                 })
-            .filter(Boolean::booleanValue)
             .count();
     totalBlobSidecars += (int) addedBlobs;
     sizeGauge.set(totalBlobSidecars, GAUGE_BLOB_SIDECARS_LABEL);
@@ -698,14 +697,15 @@ private synchronized SafeFuture<Void> fetchMissingBlobsFromLocalEL(
 
               for (int index = 0; index < blobAndProofs.size(); index++) {
                 final Optional<BlobAndProof> blobAndProof = blobAndProofs.get(index);
+                final BlobIdentifier blobIdentifier = missingBlobsIdentifiers.get(index);
                 if (blobAndProof.isEmpty()) {
-                  LOG.trace("Blob not found on local EL: {}", missingBlobsIdentifiers.get(index));
+                  LOG.trace("Blob not found on local EL: {}", blobIdentifier);
                   continue;
                 }
 
                 final BlobSidecar blobSidecar =
                     miscHelpersDeneb.constructBlobSidecarFromBlobAndProof(
-                        missingBlobsIdentifiers.get(index),
+                        blobIdentifier,
                         blobAndProof.get(),
                         beaconBlockBodyDeneb,
                         signedBeaconBlockHeader);