diff --git a/Marco.Pms.Services/Service/MasterService.cs b/Marco.Pms.Services/Service/MasterService.cs
index 763c282..e2c3bdb 100644
--- a/Marco.Pms.Services/Service/MasterService.cs
+++ b/Marco.Pms.Services/Service/MasterService.cs
@@ -1,4 +1,5 @@
 using AutoMapper;
+using AutoMapper.QueryableExtensions;
 using Marco.Pms.DataAccess.Data;
 using Marco.Pms.Helpers.Utility;
 using Marco.Pms.Model.Collection;
@@ -520,7 +521,7 @@ namespace Marco.Pms.Services.Service
                 // Step 1: Fetch services for the tenant
                 var services = await _context.ServiceMasters
                     .Where(s => s.TenantId == tenantId && s.IsActive)
-                    .Select(s => _mapper.Map<ServiceMasterVM>(s))
+                    .ProjectTo<ServiceMasterVM>(_mapper.ConfigurationProvider)
                     .OrderBy(s => s.Name)
                     .ToListAsync();