diff --git a/api-schema/src/main/java/org/stellar/anchor/api/sep/sep38/Sep38Context.java b/api-schema/src/main/java/org/stellar/anchor/api/sep/sep38/Sep38Context.java
index 586dadc419..4b6e549248 100644
--- a/api-schema/src/main/java/org/stellar/anchor/api/sep/sep38/Sep38Context.java
+++ b/api-schema/src/main/java/org/stellar/anchor/api/sep/sep38/Sep38Context.java
@@ -6,6 +6,9 @@ public enum Sep38Context {
   @SerializedName("sep6")
   SEP6("sep6"),
 
+  @SerializedName("sep24")
+  SEP24("sep24"),
+
   @SerializedName("sep31")
   SEP31("sep31");
 
diff --git a/core/src/main/java/org/stellar/anchor/sep24/Sep24Service.java b/core/src/main/java/org/stellar/anchor/sep24/Sep24Service.java
index 75bad28e91..1592e23a3c 100644
--- a/core/src/main/java/org/stellar/anchor/sep24/Sep24Service.java
+++ b/core/src/main/java/org/stellar/anchor/sep24/Sep24Service.java
@@ -7,7 +7,7 @@
 import static org.stellar.anchor.api.sep.sep24.InfoResponse.FeeResponse;
 import static org.stellar.anchor.event.EventService.EventQueue.TRANSACTION;
 import static org.stellar.anchor.sep24.Sep24Helper.fromTxn;
-import static org.stellar.anchor.sep24.Sep24Transaction.Kind.WITHDRAWAL;
+import static org.stellar.anchor.sep24.Sep24Transaction.Kind.*;
 import static org.stellar.anchor.util.Log.debug;
 import static org.stellar.anchor.util.Log.debugF;
 import static org.stellar.anchor.util.Log.info;
@@ -27,18 +27,9 @@
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.time.Instant;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 import org.stellar.anchor.api.event.AnchorEvent;
-import org.stellar.anchor.api.exception.AnchorException;
-import org.stellar.anchor.api.exception.SepException;
-import org.stellar.anchor.api.exception.SepNotAuthorizedException;
-import org.stellar.anchor.api.exception.SepNotFoundException;
-import org.stellar.anchor.api.exception.SepValidationException;
+import org.stellar.anchor.api.exception.*;
 import org.stellar.anchor.api.sep.AssetInfo;
 import org.stellar.anchor.api.sep.sep24.GetTransactionRequest;
 import org.stellar.anchor.api.sep.sep24.GetTransactionsRequest;
@@ -55,6 +46,8 @@
 import org.stellar.anchor.config.CustodyConfig;
 import org.stellar.anchor.config.Sep24Config;
 import org.stellar.anchor.event.EventService;
+import org.stellar.anchor.sep38.Sep38Quote;
+import org.stellar.anchor.sep6.ExchangeAmountsCalculator;
 import org.stellar.anchor.util.ConfigHelper;
 import org.stellar.anchor.util.CustodyUtils;
 import org.stellar.anchor.util.MetricConstants;
@@ -74,6 +67,7 @@ public class Sep24Service {
   final InteractiveUrlConstructor interactiveUrlConstructor;
   final MoreInfoUrlConstructor moreInfoUrlConstructor;
   final CustodyConfig custodyConfig;
+  final ExchangeAmountsCalculator exchangeAmountsCalculator;
 
   final Counter sep24TransactionRequestedCounter =
       counter(MetricConstants.SEP24_TRANSACTION_REQUESTED);
@@ -103,7 +97,8 @@ public Sep24Service(
       EventService eventService,
       InteractiveUrlConstructor interactiveUrlConstructor,
       MoreInfoUrlConstructor moreInfoUrlConstructor,
-      CustodyConfig custodyConfig) {
+      CustodyConfig custodyConfig,
+      ExchangeAmountsCalculator exchangeAmountsCalculator) {
     debug("appConfig:", appConfig);
     debug("sep24Config:", sep24Config);
     this.appConfig = appConfig;
@@ -116,6 +111,7 @@ public Sep24Service(
     this.interactiveUrlConstructor = interactiveUrlConstructor;
     this.moreInfoUrlConstructor = moreInfoUrlConstructor;
     this.custodyConfig = custodyConfig;
+    this.exchangeAmountsCalculator = exchangeAmountsCalculator;
     info("Sep24Service initialized.");
   }
 
@@ -250,6 +246,14 @@ public InteractiveTransactionResponse withdraw(
       builder.refundMemoType(memoTypeString(memoType(refundMemo)));
     }
 
+    String quoteId = withdrawRequest.get("quote_id");
+    if (quoteId != null) {
+      System.out.println(asset.getSep38AssetName() + 1231231);
+      AssetInfo buyAsset = assetService.getAssetByName(withdrawRequest.get("destination_asset"));
+      this.validatedAndPopulateQuote(
+          quoteId, asset, buyAsset, strAmount, builder, WITHDRAWAL.toString(), txnId);
+    }
+
     Sep24Transaction txn = builder.build();
     txnStore.save(txn);
 
@@ -340,7 +344,7 @@ public InteractiveTransactionResponse deposit(Sep10Jwt token, Map<String, String
       }
     }
 
-    // Verify that the asset code exists in our database, with withdraw enabled.
+    // Verify that the asset code exists in our database, with deposit enabled.
     AssetInfo asset = assetService.getAsset(assetCode, assetIssuer);
     if (asset == null || !asset.getDeposit().getEnabled() || !asset.getSep24Enabled()) {
       infoF("invalid operation for asset {}", assetCode);
@@ -385,7 +389,7 @@ public InteractiveTransactionResponse deposit(Sep10Jwt token, Map<String, String
         new Sep24TransactionBuilder(txnStore)
             .transactionId(txnId)
             .status(INCOMPLETE.toString())
-            .kind(Sep24Transaction.Kind.DEPOSIT.toString())
+            .kind(DEPOSIT.toString())
             .assetCode(assetCode)
             .assetIssuer(depositRequest.get("asset_issuer"))
             .startedAt(Instant.now())
@@ -410,6 +414,13 @@ public InteractiveTransactionResponse deposit(Sep10Jwt token, Map<String, String
       builder.memoType(memoTypeString(memoType(memo)));
     }
 
+    String quoteId = depositRequest.get("quote_id");
+    if (quoteId != null) {
+      AssetInfo sellAsset = assetService.getAssetByName(depositRequest.get("source_asset"));
+      this.validatedAndPopulateQuote(
+          quoteId, sellAsset, asset, strAmount, builder, DEPOSIT.toString(), txnId);
+    }
+
     Sep24Transaction txn = builder.build();
     txnStore.save(txn);
 
@@ -557,4 +568,34 @@ public InfoResponse getInfo() {
                 sep24Config.getFeatures().getClaimableBalances()))
         .build();
   }
+
+  public void validatedAndPopulateQuote(
+      String quoteId,
+      AssetInfo sellAsset,
+      AssetInfo buyAsset,
+      String strAmount,
+      Sep24TransactionBuilder builder,
+      String kind,
+      String txnId)
+      throws AnchorException {
+    Sep38Quote quote =
+        exchangeAmountsCalculator.validateQuoteAgainstRequestInfo(
+            quoteId, sellAsset, buyAsset, strAmount);
+
+    debugF("Updating transaction ({}) with quote ({})", txnId, quoteId);
+    builder.quoteId(quoteId);
+    builder.amountExpected(quote.getSellAmount());
+    builder.amountIn(quote.getSellAmount());
+    builder.amountInAsset(quote.getSellAsset());
+    builder.amountOut(quote.getBuyAmount());
+    builder.amountOutAsset(quote.getBuyAsset());
+    builder.amountFee(quote.getFee().getTotal());
+    builder.amountFeeAsset(quote.getFee().getAsset());
+
+    if (kind.equals(DEPOSIT.toString())) {
+      builder.sourceAsset(quote.getSellAsset());
+    } else {
+      builder.destinationAsset(quote.getBuyAsset());
+    }
+  }
 }
diff --git a/core/src/main/java/org/stellar/anchor/sep24/Sep24Transaction.java b/core/src/main/java/org/stellar/anchor/sep24/Sep24Transaction.java
index 0ac56475e1..785158fe31 100644
--- a/core/src/main/java/org/stellar/anchor/sep24/Sep24Transaction.java
+++ b/core/src/main/java/org/stellar/anchor/sep24/Sep24Transaction.java
@@ -236,6 +236,18 @@ public interface Sep24Transaction extends SepTransaction {
 
   String getMessage();
 
+  String getQuoteId();
+
+  void setQuoteId(String quoteId);
+
+  String getSourceAsset();
+
+  void setSourceAsset(String sourceAsset);
+
+  String getDestinationAsset();
+
+  void setDestinationAsset(String sourceAsset);
+
   enum Kind {
     DEPOSIT("deposit"),
     WITHDRAWAL("withdrawal");
diff --git a/core/src/main/java/org/stellar/anchor/sep24/Sep24TransactionBuilder.java b/core/src/main/java/org/stellar/anchor/sep24/Sep24TransactionBuilder.java
index 89b26c8c42..14f8c1642a 100644
--- a/core/src/main/java/org/stellar/anchor/sep24/Sep24TransactionBuilder.java
+++ b/core/src/main/java/org/stellar/anchor/sep24/Sep24TransactionBuilder.java
@@ -135,6 +135,18 @@ public Sep24TransactionBuilder refundMemoType(String refundMemoType) {
     return this;
   }
 
+  public void quoteId(String quoteId) {
+    txn.setQuoteId(quoteId);
+  }
+
+  public void sourceAsset(String sourceAsset) {
+    txn.setSourceAsset(sourceAsset);
+  }
+
+  public void destinationAsset(String destinationAsset) {
+    txn.setDestinationAsset(destinationAsset);
+  }
+
   public Sep24Transaction build() {
     return txn;
   }
diff --git a/core/src/main/java/org/stellar/anchor/sep38/Sep38Service.java b/core/src/main/java/org/stellar/anchor/sep38/Sep38Service.java
index 8ff9c6ff47..75871b2d02 100644
--- a/core/src/main/java/org/stellar/anchor/sep38/Sep38Service.java
+++ b/core/src/main/java/org/stellar/anchor/sep38/Sep38Service.java
@@ -1,7 +1,6 @@
 package org.stellar.anchor.sep38;
 
-import static org.stellar.anchor.api.sep.sep38.Sep38Context.SEP31;
-import static org.stellar.anchor.api.sep.sep38.Sep38Context.SEP6;
+import static org.stellar.anchor.api.sep.sep38.Sep38Context.*;
 import static org.stellar.anchor.api.sep.sep38.Sep38QuoteResponse.*;
 import static org.stellar.anchor.event.EventService.EventQueue.TRANSACTION;
 import static org.stellar.anchor.util.BeanHelper.updateField;
@@ -337,8 +336,8 @@ public Sep38QuoteResponse postQuote(Sep10Jwt token, Sep38PostQuoteRequest reques
 
     // context
     Sep38Context context = request.getContext();
-    if (context == null || !List.of(SEP6, SEP31).contains(context)) {
-      throw new BadRequestException("Unsupported context. Should be one of [sep6, sep31].");
+    if (context == null || !List.of(SEP6, SEP24, SEP31).contains(context)) {
+      throw new BadRequestException("Unsupported context. Should be one of [sep6, sep24, sep31].");
     }
 
     // Check SEP31 send limits
diff --git a/core/src/main/java/org/stellar/anchor/sep6/ExchangeAmountsCalculator.java b/core/src/main/java/org/stellar/anchor/sep6/ExchangeAmountsCalculator.java
index 70860dc0b6..595e2c1768 100644
--- a/core/src/main/java/org/stellar/anchor/sep6/ExchangeAmountsCalculator.java
+++ b/core/src/main/java/org/stellar/anchor/sep6/ExchangeAmountsCalculator.java
@@ -30,35 +30,63 @@ public class ExchangeAmountsCalculator {
    */
   public Amounts calculateFromQuote(String quoteId, AssetInfo sellAsset, String sellAmount)
       throws AnchorException {
+    Sep38Quote quote = validateQuoteAgainstRequestInfo(quoteId, sellAsset, null, sellAmount);
+    return Amounts.builder()
+        .amountIn(quote.getSellAmount())
+        .amountInAsset(quote.getSellAsset())
+        .amountOut(quote.getBuyAmount())
+        .amountOutAsset(quote.getBuyAsset())
+        .amountFee(quote.getFee().getTotal())
+        .amountFeeAsset(quote.getFee().getAsset())
+        .build();
+  }
+
+  /**
+   * validate the quote info against Sep6 or Sep24 or request info.
+   *
+   * @param quoteId The quote ID
+   * @param sellAsset The asset the user is selling. It can be null for sep24 deposit request
+   * @param buyAsset The amount the user is buying. It can be null for sep24 withdraw request
+   * @param sellAmount The amount the user is selling. It can be null for sep24 deposit and withdraw
+   *     requests
+   * @return The quote
+   * @throws AnchorException if the quote is invalid
+   */
+  public Sep38Quote validateQuoteAgainstRequestInfo(
+      String quoteId, AssetInfo sellAsset, AssetInfo buyAsset, String sellAmount)
+      throws AnchorException {
     Sep38Quote quote = sep38QuoteStore.findByQuoteId(quoteId);
     if (quote == null) {
       throw new BadRequestException("Quote not found");
     }
-    if (!amountEquals(sellAmount, quote.getSellAmount())) {
+
+    if (sellAsset != null && !sellAsset.getSep38AssetName().equals(quote.getSellAsset())) {
       throw new BadRequestException(
           String.format(
-              "amount(%s) does not match quote sell amount(%s)",
-              sellAmount, quote.getSellAmount()));
+              "source asset(%s) does not match quote sell asset(%s)",
+              sellAsset.getSep38AssetName(), quote.getSellAsset()));
     }
-    if (!sellAsset.getSep38AssetName().equals(quote.getSellAsset())) {
+
+    if (buyAsset != null && !buyAsset.getSep38AssetName().equals(quote.getBuyAsset())) {
       throw new BadRequestException(
           String.format(
-              "source asset(%s) does not match quote sell asset(%s)",
-              sellAsset.getSep38AssetName(), quote.getSellAsset()));
+              "destination asset(%s) does not match quote buy asset(%s)",
+              buyAsset.getSep38AssetName(), quote.getBuyAsset()));
     }
+
+    if (sellAmount != null && !amountEquals(sellAmount, quote.getSellAmount())) {
+      throw new BadRequestException(
+          String.format(
+              "amount(%s) does not match quote sell amount(%s)",
+              sellAmount, quote.getSellAmount()));
+    }
+
     RateFee fee = quote.getFee();
     if (fee == null) {
       throw new SepValidationException("Quote is missing the 'fee' field");
     }
 
-    return Amounts.builder()
-        .amountIn(quote.getSellAmount())
-        .amountInAsset(quote.getSellAsset())
-        .amountOut(quote.getBuyAmount())
-        .amountOutAsset(quote.getBuyAsset())
-        .amountFee(fee.getTotal())
-        .amountFeeAsset(fee.getAsset())
-        .build();
+    return quote;
   }
 
   /** Amounts calculated for an exchange request. */
diff --git a/core/src/main/java/org/stellar/anchor/util/TransactionHelper.java b/core/src/main/java/org/stellar/anchor/util/TransactionHelper.java
index 4ae9e63399..60f438cd5f 100644
--- a/core/src/main/java/org/stellar/anchor/util/TransactionHelper.java
+++ b/core/src/main/java/org/stellar/anchor/util/TransactionHelper.java
@@ -192,6 +192,7 @@ public static GetTransactionResponse toGetTransactionResponse(
         .memoType(txn.getMemoType())
         .refundMemo(txn.getRefundMemo())
         .refundMemoType(txn.getRefundMemoType())
+        .quoteId(txn.getQuoteId())
         .build();
   }
 
diff --git a/core/src/test/java/org/stellar/anchor/sep24/PojoSep24Transaction.java b/core/src/test/java/org/stellar/anchor/sep24/PojoSep24Transaction.java
index efb084c76d..619787dc4f 100644
--- a/core/src/test/java/org/stellar/anchor/sep24/PojoSep24Transaction.java
+++ b/core/src/test/java/org/stellar/anchor/sep24/PojoSep24Transaction.java
@@ -42,4 +42,7 @@ public class PojoSep24Transaction implements Sep24Transaction {
   String message;
   String refundMemo;
   String refundMemoType;
+  String quoteId;
+  String sourceAsset;
+  String destinationAsset;
 }
diff --git a/core/src/test/kotlin/org/stellar/anchor/sep24/Sep24ServiceTest.kt b/core/src/test/kotlin/org/stellar/anchor/sep24/Sep24ServiceTest.kt
index a5c4ccb83a..466899d435 100644
--- a/core/src/test/kotlin/org/stellar/anchor/sep24/Sep24ServiceTest.kt
+++ b/core/src/test/kotlin/org/stellar/anchor/sep24/Sep24ServiceTest.kt
@@ -26,6 +26,7 @@ import org.stellar.anchor.TestConstants.Companion.TEST_TRANSACTION_ID_0
 import org.stellar.anchor.TestConstants.Companion.TEST_TRANSACTION_ID_1
 import org.stellar.anchor.TestHelper
 import org.stellar.anchor.api.callback.FeeIntegration
+import org.stellar.anchor.api.exception.BadRequestException
 import org.stellar.anchor.api.exception.SepException
 import org.stellar.anchor.api.exception.SepNotAuthorizedException
 import org.stellar.anchor.api.exception.SepNotFoundException
@@ -40,6 +41,9 @@ import org.stellar.anchor.auth.Sep10Jwt
 import org.stellar.anchor.auth.Sep24InteractiveUrlJwt
 import org.stellar.anchor.config.*
 import org.stellar.anchor.event.EventService
+import org.stellar.anchor.sep38.PojoSep38Quote
+import org.stellar.anchor.sep38.Sep38QuoteStore
+import org.stellar.anchor.sep6.ExchangeAmountsCalculator
 import org.stellar.anchor.util.GsonUtils
 import org.stellar.anchor.util.MemoHelper.makeMemo
 import org.stellar.sdk.MemoHash
@@ -53,6 +57,42 @@ internal class Sep24ServiceTest {
     const val TEST_SEP24_MORE_INFO_URL = "https://test-anchor.stellar.org/more_info_url"
     val TEST_STARTED_AT: Instant = Instant.now()
     val TEST_COMPLETED_AT: Instant = Instant.now().plusSeconds(100)
+    val DEPOSIT_QUOTE_JSON =
+      """
+       {
+        "id": "test-deposit-quote-id",
+        "expires_at": "2021-04-30T07:42:23",
+        "total_price": "5.42",
+        "price": "5.00",
+        "sell_asset": "iso4217:BRL",
+        "sell_amount": "542",
+        "buy_asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP",
+        "buy_amount": "100",
+        "fee": {
+          "total": "42.00",
+          "asset": "iso4217:BRL"
+        }
+      }
+      """
+        .trimIndent()
+    val WITHDRAW_QUOTE_JSON =
+      """
+      {
+        "id": "test-withdraw-quote-id",
+        "expires_at": "2021-04-30T07:42:23",
+        "total_price": "0.542",
+        "price": "0.5",
+        "sell_asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP",
+        "sell_amount": "542",
+        "buy_asset": "iso4217:BRL",
+        "buy_amount": "1000",
+        "fee": {
+          "total": "42",
+          "asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP"
+        }
+      }
+    """
+        .trimIndent()
   }
 
   @MockK(relaxed = true) lateinit var appConfig: AppConfig
@@ -78,11 +118,16 @@ internal class Sep24ServiceTest {
 
   @MockK(relaxed = true) lateinit var clientConfig: ClientsConfig.ClientConfig
 
+  @MockK(relaxed = true) lateinit var sep38QuoteStore: Sep38QuoteStore
+
   private val assetService: AssetService = DefaultAssetService.fromJsonResource("test_assets.json")
 
   private lateinit var jwtService: JwtService
   private lateinit var sep24Service: Sep24Service
   private lateinit var testInteractiveUrlJwt: Sep24InteractiveUrlJwt
+  private lateinit var depositQuote: PojoSep38Quote
+  private lateinit var withdrawQuote: PojoSep38Quote
+  private lateinit var calculator: ExchangeAmountsCalculator
 
   private val gson = GsonUtils.getInstance()
 
@@ -103,6 +148,7 @@ internal class Sep24ServiceTest {
     every { moreInfoUrlConstructor.construct(any()) } returns
       "${TEST_SEP24_MORE_INFO_URL}?lang=en&token=$strToken"
     every { clientsConfig.getClientConfigByDomain(any()) } returns clientConfig
+    calculator = ExchangeAmountsCalculator(sep38QuoteStore)
 
     sep24Service =
       Sep24Service(
@@ -115,8 +161,11 @@ internal class Sep24ServiceTest {
         eventService,
         interactiveUrlConstructor,
         moreInfoUrlConstructor,
-        custodyConfig
+        custodyConfig,
+        calculator
       )
+    depositQuote = gson.fromJson(DEPOSIT_QUOTE_JSON, PojoSep38Quote::class.java)
+    withdrawQuote = gson.fromJson(WITHDRAW_QUOTE_JSON, PojoSep38Quote::class.java)
   }
 
   @Test
@@ -197,6 +246,19 @@ internal class Sep24ServiceTest {
     assertEquals(TEST_CLIENT_DOMAIN, slotTxn.captured.clientDomain)
   }
 
+  @Test
+  fun `test withdraw with quote_id`() {
+    val slotTxn = slot<Sep24Transaction>()
+    every { txnStore.save(capture(slotTxn)) } returns null
+    every { sep38QuoteStore.findByQuoteId(any()) } returns withdrawQuote
+    sep24Service.withdraw(
+      createTestSep10JwtWithMemo(),
+      createTestTransactionRequest(withdrawQuote.id)
+    )
+    assertEquals(withdrawQuote.id, slotTxn.captured.quoteId)
+    assertEquals(withdrawQuote.buyAsset, slotTxn.captured.destinationAsset)
+  }
+
   @Test
   fun `test withdrawal with no token and no request failure`() {
     assertThrows<SepValidationException> {
@@ -245,6 +307,13 @@ internal class Sep24ServiceTest {
       token.sub = "G1234"
       sep24Service.withdraw(token, request)
     }
+
+    assertThrows<BadRequestException> {
+      val request = createTestTransactionRequest("bad-quote-id")
+      val token = createTestSep10JwtToken()
+      every { sep38QuoteStore.findByQuoteId(any()) } returns null
+      sep24Service.withdraw(token, request)
+    }
   }
 
   @ParameterizedTest
@@ -310,6 +379,19 @@ internal class Sep24ServiceTest {
     assertEquals(TEST_CLIENT_DOMAIN, slotTxn.captured.clientDomain)
   }
 
+  @Test
+  fun `test deposit with quote_id`() {
+    val slotTxn = slot<Sep24Transaction>()
+    every { txnStore.save(capture(slotTxn)) } returns null
+    every { sep38QuoteStore.findByQuoteId(any()) } returns depositQuote
+    sep24Service.deposit(
+      createTestSep10JwtWithMemo(),
+      createTestTransactionRequest(depositQuote.id)
+    )
+    assertEquals(depositQuote.id, slotTxn.captured.quoteId)
+    assertEquals(depositQuote.sellAsset, slotTxn.captured.sourceAsset)
+  }
+
   @Test
   fun `test deposit with no token and no request`() {
     assertThrows<SepValidationException> {
@@ -401,6 +483,13 @@ internal class Sep24ServiceTest {
       token.sub = "G1234"
       sep24Service.deposit(token, request)
     }
+
+    assertThrows<BadRequestException> {
+      val request = createTestTransactionRequest("bad-quote-id")
+      val token = createTestSep10JwtToken()
+      every { sep38QuoteStore.findByQuoteId(any()) } returns null
+      sep24Service.deposit(token, request)
+    }
   }
 
   @ParameterizedTest
diff --git a/core/src/test/kotlin/org/stellar/anchor/sep24/Sep24ServiceTestHelper.kt b/core/src/test/kotlin/org/stellar/anchor/sep24/Sep24ServiceTestHelper.kt
index fef1b9aa24..97ee312f13 100644
--- a/core/src/test/kotlin/org/stellar/anchor/sep24/Sep24ServiceTestHelper.kt
+++ b/core/src/test/kotlin/org/stellar/anchor/sep24/Sep24ServiceTestHelper.kt
@@ -2,17 +2,24 @@ package org.stellar.anchor.sep24
 
 import org.stellar.anchor.TestConstants
 
-fun createTestTransactionRequest(): MutableMap<String, String> {
-  return mutableMapOf(
-    "lang" to "en",
-    "asset_code" to TestConstants.TEST_ASSET,
-    "asset_issuer" to TestConstants.TEST_ASSET_ISSUER_ACCOUNT_ID,
-    "account" to TestConstants.TEST_ACCOUNT,
-    "amount" to "123.4",
-    "email_address" to "jamie@stellar.org",
-    "first_name" to "Jamie",
-    "last_name" to "Li"
-  )
+fun createTestTransactionRequest(
+  quoteID: String? = null,
+): MutableMap<String, String> {
+  val request =
+    mutableMapOf(
+      "lang" to "en",
+      "asset_code" to TestConstants.TEST_ASSET,
+      "asset_issuer" to TestConstants.TEST_ASSET_ISSUER_ACCOUNT_ID,
+      "account" to TestConstants.TEST_ACCOUNT,
+      "amount" to "542",
+      "email_address" to "jamie@stellar.org",
+      "first_name" to "Jamie",
+      "last_name" to "Li",
+    )
+  if (quoteID != null) {
+    request["quote_id"] = quoteID
+  }
+  return request
 }
 
 fun createTestTransaction(kind: String): Sep24Transaction {
diff --git a/core/src/test/kotlin/org/stellar/anchor/sep38/Sep38ServiceTest.kt b/core/src/test/kotlin/org/stellar/anchor/sep38/Sep38ServiceTest.kt
index 47ceba852a..0ce4d2a284 100644
--- a/core/src/test/kotlin/org/stellar/anchor/sep38/Sep38ServiceTest.kt
+++ b/core/src/test/kotlin/org/stellar/anchor/sep38/Sep38ServiceTest.kt
@@ -819,7 +819,7 @@ class Sep38ServiceTest {
       )
     }
     assertInstanceOf(BadRequestException::class.java, ex)
-    assertEquals("Unsupported context. Should be one of [sep6, sep31].", ex.message)
+    assertEquals("Unsupported context. Should be one of [sep6, sep24, sep31].", ex.message)
 
     // sell_amount should be within limit
     ex = assertThrows {
diff --git a/core/src/test/kotlin/org/stellar/anchor/sep6/ExchangeAmountsCalculatorTest.kt b/core/src/test/kotlin/org/stellar/anchor/sep6/ExchangeAmountsCalculatorTest.kt
index 151b4bc285..e887d1543d 100644
--- a/core/src/test/kotlin/org/stellar/anchor/sep6/ExchangeAmountsCalculatorTest.kt
+++ b/core/src/test/kotlin/org/stellar/anchor/sep6/ExchangeAmountsCalculatorTest.kt
@@ -103,4 +103,18 @@ class ExchangeAmountsCalculatorTest {
       calculator.calculateFromQuote(quoteId, assetService.getAsset("USDC"), "100")
     }
   }
+
+  @Test
+  fun `test validateQuoteAgainstRequestInfo with mismatched buy asset`() {
+    val quoteId = "id"
+    every { sep38QuoteStore.findByQuoteId(quoteId) } returns usdcQuote
+    assertThrows<BadRequestException> {
+      calculator.validateQuoteAgainstRequestInfo(
+        quoteId,
+        assetService.getAsset("USDC"),
+        assetService.getAsset("JPYC"),
+        "100"
+      )
+    }
+  }
 }
diff --git a/platform/src/main/java/org/stellar/anchor/platform/component/sep/SepBeans.java b/platform/src/main/java/org/stellar/anchor/platform/component/sep/SepBeans.java
index 23c10c280f..6b93be61ac 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/component/sep/SepBeans.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/component/sep/SepBeans.java
@@ -180,7 +180,10 @@ Sep24Service sep24Service(
       EventService eventService,
       InteractiveUrlConstructor interactiveUrlConstructor,
       MoreInfoUrlConstructor moreInfoUrlConstructor,
-      CustodyConfig custodyConfig) {
+      CustodyConfig custodyConfig,
+      Sep38QuoteStore sep38QuoteStore) {
+    ExchangeAmountsCalculator exchangeAmountsCalculator =
+        new ExchangeAmountsCalculator(sep38QuoteStore);
     return new Sep24Service(
         appConfig,
         sep24Config,
@@ -191,7 +194,8 @@ Sep24Service sep24Service(
         eventService,
         interactiveUrlConstructor,
         moreInfoUrlConstructor,
-        custodyConfig);
+        custodyConfig,
+        exchangeAmountsCalculator);
   }
 
   @Bean
diff --git a/platform/src/main/java/org/stellar/anchor/platform/data/JdbcSep24Transaction.java b/platform/src/main/java/org/stellar/anchor/platform/data/JdbcSep24Transaction.java
index 3f74f80e70..1699279120 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/data/JdbcSep24Transaction.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/data/JdbcSep24Transaction.java
@@ -135,4 +135,16 @@ public void setRefunds(Sep24Refunds refunds) {
   @SerializedName("refund_memo_type")
   @Column(name = "refund_memo_type")
   String refundMemoType;
+
+  @SerializedName("quote_id")
+  @Column(name = "quote_id")
+  String quoteId;
+
+  @SerializedName("source_asset")
+  @Column(name = "source_asset")
+  String sourceAsset;
+
+  @SerializedName("destination_asset")
+  @Column(name = "destination_asset")
+  String destinationAsset;
 }
diff --git a/platform/src/main/resources/db/migration/V11__sep24_field_updates.sql b/platform/src/main/resources/db/migration/V11__sep24_field_updates.sql
new file mode 100644
index 0000000000..ea5faf4342
--- /dev/null
+++ b/platform/src/main/resources/db/migration/V11__sep24_field_updates.sql
@@ -0,0 +1,5 @@
+ALTER TABLE sep24_transaction ADD quote_id VARCHAR(255);
+
+ALTER TABLE sep24_transaction ADD source_asset VARCHAR(255);
+
+ALTER TABLE sep24_transaction ADD destination_asset VARCHAR(255);
\ No newline at end of file