diff --git a/apps/edr-passenger-api/src/modules/packages/packages.service.ts b/apps/edr-passenger-api/src/modules/packages/packages.service.ts
index 746c8922d..05b886ea8 100644
--- a/apps/edr-passenger-api/src/modules/packages/packages.service.ts
+++ b/apps/edr-passenger-api/src/modules/packages/packages.service.ts
@@ -63,8 +63,7 @@ export class PackagesService {
       },
     });
     if (!pkg || pkg.status !== 'ACTIVE') throw new NotFoundException('Package not available');
-
-    const tier = pkg.priceTiers.find(t => t.id === tierId);
+    const tier = pkg.priceTiers.find((t) => t.id === tierId);
     if (!tier) throw new NotFoundException('Price tier not found');
 
     if (adultCount < 1) throw new BadRequestException('At least one adult passenger required');
@@ -127,12 +126,12 @@ export class PackagesService {
       },
       returnSchedule: pkg.returnSchedule ? {
         scheduleId: pkg.returnScheduleId,
-        originStationId: pkg.destinationStationId,
-        destinationStationId: pkg.originStationId,
+        originStationId: pkg.returnSchedule.originStationId,
+        destinationStationId: pkg.returnSchedule.destinationStationId,
         departureAt: pkg.returnSchedule.departureAt,
         arrivalAt: pkg.returnSchedule.arrivalAt,
-        originStation: pkg.returnSchedule.destinationStation,
-        destinationStation: pkg.returnSchedule.originStation,
+        originStation: pkg.returnSchedule.originStation,
+        destinationStation: pkg.returnSchedule.destinationStation,
       } : null,
       includedServices: pkg.includedServices,
       busTransferIncluded: pkg.busTransferIncluded,