diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a8207fbfb6..ff5be5bb19a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Bug Fixes
+- [2059](https://github.com/FuelLabs/fuel-core/pull/2059): Remove unwrap that is breaking backwards compatibility
+
 ## [Version 0.32.0]
 
 ### Added
diff --git a/crates/client/src/client/schema/chain.rs b/crates/client/src/client/schema/chain.rs
index 4c0b3969a14..7cafc355543 100644
--- a/crates/client/src/client/schema/chain.rs
+++ b/crates/client/src/client/schema/chain.rs
@@ -337,8 +337,6 @@ impl TryFrom<GasCosts> for fuel_core_types::fuel_tx::GasCosts {
                     bhei: value.bhei.into(),
                     bhsh: value.bhsh.into(),
                     burn: value.burn.into(),
-                    bldd: value.bldd.unwrap().into(),
-                    bsiz: value.bsiz.unwrap().into(),
                     cb: value.cb.into(),
                     cfsi: value.cfsi.into(),
                     div: value.div.into(),
@@ -418,6 +416,8 @@ impl TryFrom<GasCosts> for fuel_core_types::fuel_tx::GasCosts {
                     xori: value.xori.into(),
 
                     aloc: value.aloc_dependent_cost.into(),
+                    bsiz: value.bsiz.map(Into::into).unwrap_or(fuel_core_types::fuel_tx::consensus_parameters::DependentCost::free()),
+                    bldd: value.bldd.map(Into::into).unwrap_or(fuel_core_types::fuel_tx::consensus_parameters::DependentCost::free()),
                     cfe: value.cfe.into(),
                     cfei: value.cfei_dependent_cost.into(),
                     call: value.call.into(),