diff --git a/backend/services/contribution-service/src/application/queries/get-contribution-account.query.ts b/backend/services/contribution-service/src/application/queries/get-contribution-account.query.ts
index 25e75181..c0652610 100644
--- a/backend/services/contribution-service/src/application/queries/get-contribution-account.query.ts
+++ b/backend/services/contribution-service/src/application/queries/get-contribution-account.query.ts
@@ -183,16 +183,16 @@ export class GetContributionAccountQuery {
 
   private toRecordDto(record: any): ContributionRecordDto {
     return {
-      id: record.id,
+      id: record.id?.toString() ?? '',
       sourceType: record.sourceType,
-      sourceAdoptionId: record.sourceAdoptionId,
+      sourceAdoptionId: record.sourceAdoptionId?.toString() ?? '',
       sourceAccountSequence: record.sourceAccountSequence,
       treeCount: record.treeCount,
-      baseContribution: record.baseContribution.value.toString(),
-      distributionRate: record.distributionRate.value.toString(),
+      baseContribution: record.baseContribution?.value?.toString() ?? '0',
+      distributionRate: record.distributionRate?.value?.toString() ?? '0',
       levelDepth: record.levelDepth,
       bonusTier: record.bonusTier,
-      finalContribution: record.finalContribution.value.toString(),
+      finalContribution: record.amount?.value?.toString() ?? '0',
       effectiveDate: record.effectiveDate,
       expireDate: record.expireDate,
       isExpired: record.isExpired,