diff --git a/src/subdomains/core/custody/dto/output/custody-order-list-entry.dto.ts b/src/subdomains/core/custody/dto/output/custody-order-list-entry.dto.ts
index 37f563538d..369f13c9e0 100644
--- a/src/subdomains/core/custody/dto/output/custody-order-list-entry.dto.ts
+++ b/src/subdomains/core/custody/dto/output/custody-order-list-entry.dto.ts
@@ -9,22 +9,24 @@ export class CustodyOrderListEntry {
   inputAsset?: string;
   outputAmount?: number;
   outputAsset?: string;
-  userId?: number;
+  userDataId?: number;
   userName?: string;
-  created: Date;
+  updated: Date;
 
   static fromEntity(order: CustodyOrder): CustodyOrderListEntry {
+    const tr = order.transactionRequest;
+
     return {
       id: order.id,
       type: order.type,
       status: order.status,
-      inputAmount: order.inputAmount,
+      inputAmount: order.inputAmount ?? tr?.amount,
       inputAsset: order.inputAsset?.name,
-      outputAmount: order.outputAmount,
+      outputAmount: order.outputAmount ?? tr?.estimatedAmount,
       outputAsset: order.outputAsset?.name,
-      userId: order.user?.userData?.id,
+      userDataId: order.user?.userData?.id,
       userName: order.user?.userData?.verifiedName,
-      created: order.created,
+      updated: order.updated,
     };
   }
 }
diff --git a/src/subdomains/core/custody/services/custody-order.service.ts b/src/subdomains/core/custody/services/custody-order.service.ts
index 3978be4d6d..2bd534ccbf 100644
--- a/src/subdomains/core/custody/services/custody-order.service.ts
+++ b/src/subdomains/core/custody/services/custody-order.service.ts
@@ -123,6 +123,7 @@ export class CustodyOrderService {
         );
 
         orderDto.swap = await this.swapService.getById(swapPaymentInfo.routeId);
+        orderDto.inputAsset = targetAsset;
         orderDto.outputAsset = sourceAsset;
         orderDto.outputAmount = swapPaymentInfo.amount;
         paymentInfo = CustodyOrderResponseDtoMapper.mapSwapPaymentInfo(swapPaymentInfo);