diff --git a/crates/storage/storage-api/src/block_id.rs b/crates/storage/storage-api/src/block_id.rs
index db40dff24a..fbbf6fce55 100644
--- a/crates/storage/storage-api/src/block_id.rs
+++ b/crates/storage/storage-api/src/block_id.rs
@@ -62,14 +62,12 @@ pub trait BlockIdReader: BlockNumReader + Send + Sync {
                     .map(|res_opt| res_opt.map(|num_hash| num_hash.number))
             }
             BlockNumberOrTag::Number(num) => num,
-            BlockNumberOrTag::Finalized => match self.finalized_block_number()? {
-                Some(block_number) => block_number,
-                None => return Err(ProviderError::FinalizedBlockNotFound),
-            },
-            BlockNumberOrTag::Safe => match self.safe_block_number()? {
-                Some(block_number) => block_number,
-                None => return Err(ProviderError::SafeBlockNotFound),
-            },
+            BlockNumberOrTag::Finalized => {
+                self.finalized_block_number()?.ok_or(ProviderError::FinalizedBlockNotFound)?
+            }
+            BlockNumberOrTag::Safe => {
+                self.safe_block_number()?.ok_or(ProviderError::SafeBlockNotFound)?
+            }
         };
         Ok(Some(num))
     }