diff --git a/PARR.DAL/DomainServices/Implementations/UnitFilterService.cs b/PARR.DAL/DomainServices/Implementations/UnitFilterService.cs
index 5a237d16..b062e3cf 100644
--- a/PARR.DAL/DomainServices/Implementations/UnitFilterService.cs
+++ b/PARR.DAL/DomainServices/Implementations/UnitFilterService.cs
@@ -78,6 +78,9 @@ namespace PARR.DAL.DomainServices.Implementations
 
             foreach (var unitFilter in job.UnitFilters)
             {
+                if (takeCount.HasValue && result.Count() > takeCount.Value)
+                    break;
+
                 var query = baseQuery.Where(t => EF.Functions.ILike(t.Name, unitFilter.UnitFilter));
 
                 foreach (var fieldFilter in unitFilter.FieldFilters)
@@ -113,13 +116,13 @@ namespace PARR.DAL.DomainServices.Implementations
                         query = query.Where(t => t.ChildUnits.Count() >= job.MinValueRelationships && t.ChildUnits.Count() <= job.MaxValueRelationships);
                 }
 
-                if (takeCount.HasValue)
-                    query = query.Take(takeCount.Value);
-
                 var newUnits = await query.Select(t => t.Id).ToListAsync();
                 result.AddRange(newUnits);
             }
 
+            if (takeCount.HasValue && result.Count() > takeCount.Value)
+                result = result.Take(takeCount.Value).ToList();
+
             return result;
         }