diff --git a/src/app/core/_components/tables/tasks-table/tasks-table.component.ts b/src/app/core/_components/tables/tasks-table/tasks-table.component.ts
index d103356a..a96c33ab 100644
--- a/src/app/core/_components/tables/tasks-table/tasks-table.component.ts
+++ b/src/app/core/_components/tables/tasks-table/tasks-table.component.ts
@@ -531,8 +531,13 @@ export class TasksTableComponent extends BaseTableComponent implements OnInit, O
         if (speed > 0) {
           return TaskStatus.RUNNING;
         } else if (
-          wrapper.tasks[0].keyspaceProgress >= wrapper.tasks[0].keyspace &&
-          wrapper.tasks[0].keyspaceProgress > 0
+          (wrapper.tasks[0].keyspaceProgress >= wrapper.tasks[0].keyspace &&
+            wrapper.tasks[0].keyspaceProgress > 0 &&
+            Number(wrapper.tasks[0].searched) === 100) ||
+          wrapper.tasks.find(
+            (task: JTask) =>
+              task.keyspaceProgress >= task.keyspace && task.keyspaceProgress > 0 && Number(task.searched) === 100
+          )
         ) {
           return TaskStatus.COMPLETED;
         } else {
@@ -540,21 +545,6 @@ export class TasksTableComponent extends BaseTableComponent implements OnInit, O
         }
       }
     }
-    const chunkData: ChunkData = wrapper.chunkData;
-    if (chunkData) {
-      const speed = chunkData.speed;
-
-      if (speed > 0) {
-        return TaskStatus.RUNNING;
-      } else if (
-        (wrapper.tasks[0].keyspaceProgress >= wrapper.tasks[0].keyspace && wrapper.tasks[0].keyspaceProgress > 0) ||
-        wrapper.tasks.find((task: JTask) => task.keyspaceProgress >= task.keyspace && task.keyspaceProgress > 0)
-      ) {
-        return TaskStatus.COMPLETED;
-      } else {
-        return TaskStatus.IDLE;
-      }
-    }
     return TaskStatus.INVALID;
   }
   // --- Action functions ---