diff --git a/apps/edr-freight-api/src/modules/drivers/drivers.service.ts b/apps/edr-freight-api/src/modules/drivers/drivers.service.ts
index 5bc7dba69..75b774f5c 100644
--- a/apps/edr-freight-api/src/modules/drivers/drivers.service.ts
+++ b/apps/edr-freight-api/src/modules/drivers/drivers.service.ts
@@ -44,11 +44,7 @@ export class DriversService {
     limit?: number;
     sortBy?: string;
     sortOrder?: 'ASC' | 'DESC';
-  } = {}): Promise<{ data: Driver[]; total: number; page: number; limit: number }> {
-    const page = query.page || 1;
-    const limit = query.limit || 10;
-    const skip = (page - 1) * limit;
-
+  } = {}): Promise<Driver[]> {
     let qb = this.driverRepo.createQueryBuilder('d');
 
     if (query.search) {
@@ -67,13 +63,9 @@ export class DriversService {
       : 'createdAt';
     const sortOrder = (query.sortOrder ?? 'DESC').toUpperCase();
 
-    const [data, total] = await qb
+    return qb
       .orderBy(`d.${sortBy}`, sortOrder as 'ASC' | 'DESC')
-      .skip(skip)
-      .take(limit)
-      .getManyAndCount();
-
-    return { data, total, page, limit };
+      .getMany();
   }
 
   async findById(id: string): Promise<Driver> {
diff --git a/apps/edr-freight-api/src/modules/vehicles/vehicles.service.ts b/apps/edr-freight-api/src/modules/vehicles/vehicles.service.ts
index 448e2ff91..2bc882591 100644
--- a/apps/edr-freight-api/src/modules/vehicles/vehicles.service.ts
+++ b/apps/edr-freight-api/src/modules/vehicles/vehicles.service.ts
@@ -39,11 +39,7 @@ export class VehiclesService {
     limit?: number;
     sortBy?: string;
     sortOrder?: 'ASC' | 'DESC';
-  } = {}): Promise<{ data: Vehicle[]; total: number; page: number; limit: number }> {
-    const page = query.page || 1;
-    const limit = query.limit || 10;
-    const skip = (page - 1) * limit;
-
+  } = {}): Promise<Vehicle[]> {
     let qb = this.vehicleRepo.createQueryBuilder('v');
 
     if (query.search) {
@@ -64,13 +60,9 @@ export class VehiclesService {
       : 'createdAt';
     const sortOrder = (query.sortOrder ?? 'DESC').toUpperCase();
 
-    const [data, total] = await qb
+    return qb
       .orderBy(`v.${sortBy}`, sortOrder as 'ASC' | 'DESC')
-      .skip(skip)
-      .take(limit)
-      .getManyAndCount();
-
-    return { data, total, page, limit };
+      .getMany();
   }
 
   async findById(id: string): Promise<Vehicle> {