diff --git a/src/bin/hive_chain.rs b/src/bin/hive_chain.rs
index 6b4ba7791..d6ac8e9da 100644
--- a/src/bin/hive_chain.rs
+++ b/src/bin/hive_chain.rs
@@ -65,7 +65,7 @@ async fn main() -> eyre::Result<()> {
         for transaction in body.transactions {
             let signer = transaction.recover_signer().ok_or(eyre!("Failed to recover signer"))?;
             let chain_id = transaction.chain_id().ok_or(eyre!("Failed to recover chain id"))?;
-            let starknet_tx = to_starknet_transaction(&transaction, chain_id, signer)?;
+            let starknet_tx = to_starknet_transaction(&transaction, chain_id, signer, u64::MAX)?;
 
             // Stop if the nonce is incorrect
             assert_eq!(starknet_tx.nonce, current_nonce);
diff --git a/src/eth_provider/provider.rs b/src/eth_provider/provider.rs
index 476dd5bb8..569a16930 100644
--- a/src/eth_provider/provider.rs
+++ b/src/eth_provider/provider.rs
@@ -480,7 +480,28 @@ where
         let signer = transaction_signed
             .recover_signer()
             .ok_or_else(|| ConversionError::ToStarknetTransactionError("Failed to recover signer".to_string()))?;
-        let transaction = to_starknet_transaction(&transaction_signed, chain_id, signer)?;
+
+        let max_fee: u64;
+        #[cfg(not(feature = "hive"))]
+        {
+            // TODO(Kakarot Fee Mechanism): When we no longer need to use the Starknet fees, remove this line.
+            // We need to get the balance (in Kakarot/Starknet native Token) of the signer to compute the Starknet maximum `max_fee`.
+            // We used to set max_fee = u64::MAX, but it'll fail if the signer doesn't have enough balance to pay the fees.
+            let eth_fees_per_gas =
+                transaction_signed.effective_gas_price(Some(transaction_signed.max_fee_per_gas() as u64)) as u64;
+            let eth_fees = eth_fees_per_gas.saturating_mul(transaction_signed.gas_limit());
+            let balance = self.balance(signer, None).await?;
+            max_fee = {
+                let max_fee: u64 = balance.try_into().unwrap_or(u64::MAX);
+                max_fee.saturating_sub(eth_fees)
+            };
+        }
+        #[cfg(feature = "hive")]
+        {
+            max_fee = u64::MAX;
+        }
+
+        let transaction = to_starknet_transaction(&transaction_signed, chain_id, signer, max_fee)?;
 
         // If the contract is not found, we need to deploy it.
         #[cfg(feature = "hive")]
@@ -526,7 +547,13 @@ where
         #[cfg(not(feature = "testing"))]
         {
             let hash = transaction_signed.hash();
-            self.starknet_provider.add_invoke_transaction(BroadcastedInvokeTransaction::V1(transaction)).await?;
+            let tx =
+                self.starknet_provider.add_invoke_transaction(BroadcastedInvokeTransaction::V1(transaction)).await?;
+            tracing::info!(
+                "Fired a transaction: Starknet Hash: {:?} --- Ethereum Hash: {:?}",
+                tx.transaction_hash,
+                hash
+            );
             Ok(hash)
         }
         // If we are currently testing, we need to return the starknet hash in order
diff --git a/src/eth_provider/starknet/kakarot_core.rs b/src/eth_provider/starknet/kakarot_core.rs
index f517b277a..f0a4286a2 100644
--- a/src/eth_provider/starknet/kakarot_core.rs
+++ b/src/eth_provider/starknet/kakarot_core.rs
@@ -67,6 +67,7 @@ pub fn to_starknet_transaction(
     transaction: &TransactionSigned,
     chain_id: u64,
     signer: Address,
+    max_fee: u64,
 ) -> EthProviderResult<BroadcastedInvokeTransactionV1> {
     let starknet_address = starknet_address(signer);
 
@@ -111,9 +112,8 @@ pub fn to_starknet_transaction(
     ]);
     execute_calldata.append(&mut signed_data.into_iter().map(FieldElement::from).collect());
 
-    let max_fee = (u64::MAX).into();
     Ok(BroadcastedInvokeTransactionV1 {
-        max_fee,
+        max_fee: max_fee.into(),
         signature,
         nonce,
         sender_address: starknet_address,