diff --git a/apps/edr-freight-api/src/modules/fuel/fuel.service.ts b/apps/edr-freight-api/src/modules/fuel/fuel.service.ts
index 0bf89a805..77aab5842 100644
--- a/apps/edr-freight-api/src/modules/fuel/fuel.service.ts
+++ b/apps/edr-freight-api/src/modules/fuel/fuel.service.ts
@@ -31,7 +31,11 @@ export class FuelService {
   }
 
   async getAllFuelPurchases(): Promise<FuelPurchase[]> {
-    return this.purchaseRepository.find({ order: { purchaseDate: 'DESC' } });
+    return this.purchaseRepository
+      .createQueryBuilder('purchase')
+      .leftJoinAndSelect('purchase.vehicle', 'vehicle')
+      .orderBy('purchase.purchaseDate', 'DESC')
+      .getMany();
   }
 
   async getFuelPurchases(
diff --git a/apps/edr-freight-web/backoffice/src/pages/fleet/FuelPurchasePage.tsx b/apps/edr-freight-web/backoffice/src/pages/fleet/FuelPurchasePage.tsx
index 983da8734..b3c168df3 100644
--- a/apps/edr-freight-web/backoffice/src/pages/fleet/FuelPurchasePage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/fleet/FuelPurchasePage.tsx
@@ -199,7 +199,7 @@ export default function FuelPurchasePage() {
           <Table.Tbody>
             {(purchasesData as FuelPurchase[])?.map((purchase) => (
               <Table.Tr key={purchase.id}>
-                <Table.Td>{purchase.vehicleName || purchase.vehicleId}</Table.Td>
+                <Table.Td>{(purchase as any).vehicle?.registrationNumber || (purchase as any).vehicle?.plateNumber || purchase.vehicleId}</Table.Td>
                 <Table.Td>{new Date(purchase.purchaseDate).toLocaleDateString()}</Table.Td>
                 <Table.Td align="right">{Number(purchase.liters).toFixed(2)}</Table.Td>
                 <Table.Td align="right">ETB {Number(purchase.costPerLiter).toFixed(2)}</Table.Td>