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 f83939db16..ca2ea381b5 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
@@ -1,5 +1,5 @@
 import { CustodyOrder } from '../../entities/custody-order.entity';
-import { CustodyOrderStatus, CustodyOrderType } from '../../enums/custody';
+import { CustodyIncomingTypes, CustodyOrderStatus, CustodyOrderType, CustodySwapTypes } from '../../enums/custody';
 
 export class CustodyOrderListEntry {
   id: number;
@@ -14,15 +14,17 @@ export class CustodyOrderListEntry {
   updated: Date;
 
   static fromEntity(order: CustodyOrder): CustodyOrderListEntry {
-    const tr = order.transactionRequest;
+    const isIncoming = CustodyIncomingTypes.includes(order.type);
+    const isSwap = CustodySwapTypes.includes(order.type);
 
     return {
       id: order.id,
       type: order.type,
       status: order.status,
-      inputAmount: order.inputAmount ?? tr?.estimatedAmount,
+      inputAmount:
+        isIncoming || isSwap ? (order.inputAmount ?? order.transactionRequest?.estimatedAmount) : order.inputAmount,
       inputAsset: order.inputAsset?.name,
-      outputAmount: order.outputAmount ?? tr?.amount,
+      outputAmount: isIncoming ? order.outputAmount : (order.outputAmount ?? order.transactionRequest?.amount),
       outputAsset: order.outputAsset?.name,
       userDataId: order.user?.userData?.id,
       userName: order.user?.userData?.verifiedName,
diff --git a/src/subdomains/core/custody/services/custody-order.service.ts b/src/subdomains/core/custody/services/custody-order.service.ts
index 10b31bc3db..919ea39f25 100644
--- a/src/subdomains/core/custody/services/custody-order.service.ts
+++ b/src/subdomains/core/custody/services/custody-order.service.ts
@@ -194,6 +194,7 @@ export class CustodyOrderService {
         );
 
         orderDto.swap = await this.swapService.getById(swapPaymentInfo.routeId);
+        orderDto.inputAsset = targetAsset;
         paymentInfo = CustodyOrderResponseDtoMapper.mapSwapPaymentInfo(swapPaymentInfo);
         break;
       }
@@ -317,7 +318,7 @@ export class CustodyOrderService {
     const estimatedAmount =
       equityPair.direction === EquityDirection.MINT ? sourceAmount / equityPrice : sourceAmount * equityPrice;
 
-    const zeroFee = { min: 0, rate: 0, fixed: 0, dfx: 0, network: 0, platform: 0 };
+    const zeroFee = { min: 0, rate: 0, fixed: 0, dfx: 0, network: 0, platform: 0, bank: 0, total: 0 };
 
     return Object.assign(new CustodyOrderResponseDto(), {
       id: undefined,