diff --git a/cloud/tasks/lister.go b/cloud/tasks/lister.go
index 4f2cefde7f..ac3ee98564 100644
--- a/cloud/tasks/lister.go
+++ b/cloud/tasks/lister.go
@@ -99,6 +99,13 @@ func (l *lister) loop(ctx context.Context) {
 					value, _ := l.inflightTasksByType.LoadOrStore(task.TaskType, int64(0))
 					taskCount := value.(int64)
 
+					logging.Debug(
+						ctx,
+						"lister listed %v tasks with taskType %v",
+						taskCount,
+						task.TaskType,
+					)
+
 					if taskCount >= taskLimit {
 						taskIdx++
 						// Skip task in order not to exceed limit for inflight tasks count
diff --git a/cloud/tasks/tasks_tests/tasks_test.go b/cloud/tasks/tasks_tests/tasks_test.go
index 3854c7d548..43ad49f360 100644
--- a/cloud/tasks/tasks_tests/tasks_test.go
+++ b/cloud/tasks/tasks_tests/tasks_test.go
@@ -687,12 +687,11 @@ func TestTasksRunningLimit(t *testing.T) {
 			)
 			require.NoError(t, err)
 
+			logging.Debug(ctx, "Listed running tasks: %v+", runningTasks)
+
 			runningLongTaskCount := 0
 			for _, task := range runningTasks {
-				taskState, err := s.storage.GetTask(ctx, task.ID)
-				require.NoError(t, err)
-
-				if taskState.TaskType == "long" {
+				if task.TaskType == "long" {
 					runningLongTaskCount++
 				}
 			}