diff --git a/lib/process-services/task-list/components/task-list.component.ts b/lib/process-services/task-list/components/task-list.component.ts
index 66892a3466..87445fdec7 100644
--- a/lib/process-services/task-list/components/task-list.component.ts
+++ b/lib/process-services/task-list/components/task-list.component.ts
@@ -257,7 +257,8 @@ export class TaskListComponent extends DataTableSchema implements OnChanges, Aft
                 dataRow = this.rows.find((currentRow: any) => {
                     return currentRow['id'] === taskIdSelected;
                 });
-            } else if (this.selectFirstRow) {
+            }
+            if (!dataRow && this.selectFirstRow) {
                 dataRow = this.rows[0];
             }
             if (dataRow) {