diff --git a/Marco.Pms.Services/Helpers/DirectoryHelper.cs b/Marco.Pms.Services/Helpers/DirectoryHelper.cs
index 2963ff2..7af4b4d 100644
--- a/Marco.Pms.Services/Helpers/DirectoryHelper.cs
+++ b/Marco.Pms.Services/Helpers/DirectoryHelper.cs
@@ -1157,11 +1157,12 @@ namespace Marco.Pms.Services.Helpers
 
             List<EmployeeBucketMapping> employeeBuckets = await _context.EmployeeBucketMappings.Where(b => b.EmployeeId == LoggedInEmployee.Id).ToListAsync();
             var bucketIds = employeeBuckets.Select(b => b.BucketId).ToList();
-            List<EmployeeBucketMapping> employeeBucketVM = await _context.EmployeeBucketMappings.Where(b => bucketIds.Contains(b.BucketId)).ToListAsync();
+
             List<Bucket> bucketList = new List<Bucket>();
             if (permissionIds.Contains(PermissionsMaster.DirectoryAdmin))
             {
                 bucketList = await _context.Buckets.Include(b => b.CreatedBy).Where(b => b.TenantId == tenantId).ToListAsync();
+                bucketIds = bucketList.Select(b => b.Id).ToList();
             }
             else if (permissionIds.Contains(PermissionsMaster.DirectoryAdmin) || permissionIds.Contains(PermissionsMaster.DirectoryUser))
             {
@@ -1173,6 +1174,8 @@ namespace Marco.Pms.Services.Helpers
                 return ApiResponse<object>.ErrorResponse("You don't have permission", "You don't have permission", 401);
             }
 
+            List<EmployeeBucketMapping> employeeBucketVM = await _context.EmployeeBucketMappings.Where(b => bucketIds.Contains(b.BucketId)).ToListAsync();
+
             List<AssignBucketVM> bucketVMs = new List<AssignBucketVM>();
             if (bucketList.Any())
             {