diff --git a/PARR.NextRun/NextRunManager.cs b/PARR.NextRun/NextRunManager.cs
index 49d0d76f..dbfbe99c 100644
--- a/PARR.NextRun/NextRunManager.cs
+++ b/PARR.NextRun/NextRunManager.cs
@@ -56,7 +56,10 @@ namespace PARR.NextRun
         /// <returns></returns>
         private async Task HandlerAsync(ITemplateService templateService, IEsppScheduleTransformService esppScheduleTransformService)
         {
-            var templates = await templateService.Get().Where(t => t.NextRun < DateTimeOffset.UtcNow).ToListAsync();
+            var templates = await templateService.Get()
+                                    .Include(t => t.Job)
+                                        .ThenInclude(t => t.Group)
+                                    .Where(t => t.NextRun < DateTimeOffset.UtcNow).ToListAsync();
 
             logger.LogDebug($"Шаблонов для обновления: {templates.Count()} шт.");
 
@@ -64,7 +67,7 @@ namespace PARR.NextRun
 
             foreach (var template in templates)
             {
-                var nextRun = await esppScheduleTransformService.GetNextDateAsync(template.JobId, template.NextRun);
+                var nextRun = await esppScheduleTransformService.GetNextDateAsync(template.Job!.GroupId, template.NextRun);
                 template.LastRun = template.NextRun;
                 template.NextRun = nextRun;