diff --git a/src/modules/record/stores/useTaskRecordStore.ts b/src/modules/record/stores/useTaskRecordStore.ts
index e1c1151..2321a9a 100644
--- a/src/modules/record/stores/useTaskRecordStore.ts
+++ b/src/modules/record/stores/useTaskRecordStore.ts
@@ -197,8 +197,8 @@ export const useTaskRecordStore = defineStore('task-record-store', {
       }
 
       const nextStepIndex = task.steps.findIndex(
-        (step) =>
-          !Object.keys(record.stepRecords).find((stepId) => stepId === step.id)
+        // the first step that has not ended
+        (step) => record.stepRecords[step.id]?.end === undefined
       )
 
       if (nextStepIndex >= 0) {