diff --git a/PARR.DAL/Repositories/TemplateRepository.cs b/PARR.DAL/Repositories/TemplateRepository.cs
index e962384e..ab8e6530 100644
--- a/PARR.DAL/Repositories/TemplateRepository.cs
+++ b/PARR.DAL/Repositories/TemplateRepository.cs
@@ -89,6 +89,7 @@ namespace PARR.DAL.Repositories
                     AttemptsNumber = 0,
                     LastRobotStatusUpdated = null
                 }
+
             };
 
             logger.LogDebug("Добавлены роботы для шаблона {TemplateName}", obj.Name);
@@ -132,7 +133,7 @@ namespace PARR.DAL.Repositories
                         AND rc.""TaskStatusCode"" = @TaskStatus
                         AND rc.""RobotStatusCode"" = @RobotStatus
                   )
-                ORDER BY t.""DateCreated"" ASC
+                ORDER BY t.""DateModified"" ASC NULLS FIRST
                 LIMIT 1
                 FOR UPDATE SKIP LOCKED
             )