diff --git a/PARR.Core/Services/RobotTask/Implementations/RobotTaskService.cs b/PARR.Core/Services/RobotTask/Implementations/RobotTaskService.cs
index 87155e01..6f0b9249 100644
--- a/PARR.Core/Services/RobotTask/Implementations/RobotTaskService.cs
+++ b/PARR.Core/Services/RobotTask/Implementations/RobotTaskService.cs
@@ -224,6 +224,7 @@ namespace PARR.Core.Services.RobotTask.Implementations
                 var endDate = DateTimeOffset.UtcNow.Add(-settingsFromDb.RobotWaitTime);
 
                 tasks = await query.Where(t => t.RobotStatusCode == (int)RobotStatusEnum.InProgress
+                                                && t.TaskStatusCode==(int)taskStatusCode
                                                 && t.AttemptsNumber < settingsFromDb.RobotAttemptsNumber
                                                 && t.LastRobotStatusUpdated < endDate)
                                     .Take(TakeTasks)