diff --git a/src/rust_indexer/ethereum_indexer_psql_historical/src/models.rs b/src/rust_indexer/ethereum_indexer_psql_historical/src/models.rs
index fed89e16aa8cfcdb115dfeb1048ac76d9ec0f77e..67431994c89c8a4fd84989439a8ac2966873ca69 100644
--- a/src/rust_indexer/ethereum_indexer_psql_historical/src/models.rs
+++ b/src/rust_indexer/ethereum_indexer_psql_historical/src/models.rs
@@ -36,7 +36,7 @@ pub struct NewBlock {
 impl<TX> From<&EthBlock<TX>> for NewBlock {
     fn from(b: &EthBlock<TX>) -> Self {
         let num = b.number.unwrap();
-        let base_fee = b.base_fee_per_gas.unwrap();
+        let base_fee = b.base_fee_per_gas.unwrap_or(U256::from(0));
 
         NewBlock {
             block_number: u64_to_i64(&num),