diff --git a/src/use-cases/order.js b/src/use-cases/order.js
index de2443e..45bfaf2 100644
--- a/src/use-cases/order.js
+++ b/src/use-cases/order.js
@@ -49,6 +49,9 @@ class OrderLib {
       const orderEntity = this.orderEntity.inputValidate(entryObj)
       console.log('orderEntity: ', orderEntity)
 
+      // Optimize the wallet to speed up working with it.
+      await this.retryQueue.addToQueue(this.adapters.wallet.bchWallet.optimize, {})
+
       // Ensure sufficient tokens exist to create the order.
       // await this.ensureFunds(orderEntity)
       await this.retryQueue.addToQueue(this.ensureFunds, orderEntity)
diff --git a/test/unit/mocks/adapters/wallet.js b/test/unit/mocks/adapters/wallet.js
index 7a0c921..6c55611 100644
--- a/test/unit/mocks/adapters/wallet.js
+++ b/test/unit/mocks/adapters/wallet.js
@@ -37,6 +37,7 @@ class MockBchWallet {
     this.getTokenData = async () => {}
     this.initialize = async () => {}
     this.utxoIsValid = async () => {}
+    this.optimize = async () => {}
 
     // Environment variable is used by wallet-balance.unit.js to force an error.
     if (process.env.NO_UTXO) {