diff --git a/taptrade-cli-demo/trader/src/trading/mod.rs b/taptrade-cli-demo/trader/src/trading/mod.rs
index 8567318..2b1fd14 100644
--- a/taptrade-cli-demo/trader/src/trading/mod.rs
+++ b/taptrade-cli-demo/trader/src/trading/mod.rs
@@ -28,7 +28,11 @@ pub fn run_maker(maker_config: &TraderSettings) -> Result<()> {
 
 	let offer = ActiveOffer::create(&wallet, maker_config)?;
 	dbg!(&offer);
-	let trade_psbt = offer.wait_until_taken(maker_config)?;
+	let mut escrow_contract_psbt = offer.wait_until_taken(maker_config)?;
+
+	wallet
+		.validate_maker_psbt(&escrow_contract_psbt)?
+		.sign_escrow_psbt(&mut escrow_contract_psbt)?;
 
 	Ok(())
 }
diff --git a/taptrade-cli-demo/trader/src/wallet/mod.rs b/taptrade-cli-demo/trader/src/wallet/mod.rs
index d0cd1f1..dfd1186 100644
--- a/taptrade-cli-demo/trader/src/wallet/mod.rs
+++ b/taptrade-cli-demo/trader/src/wallet/mod.rs
@@ -77,7 +77,7 @@ impl TradingWallet {
 	// input amount should be the bond amount when buying,
 	pub fn validate_taker_psbt(&self, psbt: &PartiallySignedTransaction) -> Result<&Self> {
 		dbg!("IMPLEMENT TAKER PSBT VALIDATION!");
-		// tbd once the trade psbt is implemented
+		// tbd once the trade psbt is implemented on coordinator side
 		Ok(self)
 	}
 
@@ -88,4 +88,10 @@ impl TradingWallet {
 		}
 		Ok(self)
 	}
+
+	pub fn validate_maker_psbt(&self, psbt: &PartiallySignedTransaction) -> Result<&Self> {
+		dbg!("IMPLEMENT MAKER PSBT VALIDATION!");
+		// tbd once the trade psbt is implemented on coordinator side
+		Ok(self)
+	}
 }