diff --git a/src/modules/record/components/RecordControls.vue b/src/modules/record/components/RecordControls.vue
index e0f5c38..9799837 100644
--- a/src/modules/record/components/RecordControls.vue
+++ b/src/modules/record/components/RecordControls.vue
@@ -23,13 +23,13 @@ const getNextStepId = () => {
     return null
   }
 
-  if (!recordStore.currentStepId) {
+  if (!record.value.currentStepId) {
     const [firstStep] = task.value.steps
     return firstStep.id
   }
 
   const currentStepIndex = task.value.steps.findIndex(
-    (step) => step.id === recordStore.currentStepId
+    (step) => step.id === record.value.currentStepId
   )
 
   const canHaveNextIndex =
@@ -46,7 +46,9 @@ const hasStarted = computed(
   () => Object.values(record.value?.stepRecords ?? {}).length > 0
 )
 
-const canStart = computed(() => !recordStore.currentStepId && !hasStarted.value)
+const canStart = computed(
+  () => !record.value.currentStepId && !hasStarted.value
+)
 
 const startRecording = () => {
   if (!canStart.value || !task.value) {
@@ -61,13 +63,13 @@ const startRecording = () => {
 }
 
 const nextStep = () => {
-  if (!task.value || !recordStore.currentStepId || !record.value) {
+  if (!task.value || !record.value.currentStepId || !record.value) {
     return
   }
 
   recordStore.nextStepRecord({
     taskId: record.value.taskId,
-    currentStepId: recordStore.currentStepId,
+    currentStepId: record.value.currentStepId,
     nextStepId: getNextStepId(),
     tick: toISODate(new Date())
   })
@@ -108,7 +110,7 @@ onUnmounted(() => {
 
 <template>
   <div class="record-controls buttons has-addons">
-    <template v-if="record && recordStore.currentStepId">
+    <template v-if="record && record.currentStepId">
       <button
         class="button is-primary is-light"
         v-if="record.breakTime"
diff --git a/src/modules/record/components/StepRecord.vue b/src/modules/record/components/StepRecord.vue
index c180e06..a19c5ce 100644
--- a/src/modules/record/components/StepRecord.vue
+++ b/src/modules/record/components/StepRecord.vue
@@ -19,7 +19,9 @@ const step = computed(() => taskStore.getStep(props.taskId, props.stepId))
 const stepRecord = computed(() =>
   recordStore.getStepRecord(props.taskId, props.stepId)
 )
-const isCurrentStep = computed(() => recordStore.currentStepId === props.stepId)
+const isCurrentStep = computed(
+  () => record.value?.currentStepId === props.stepId
+)
 const isInBreakTime = computed(() => !!record.value?.breakTime)
 
 const now = ref(toISODate(new Date()))
diff --git a/src/modules/record/components/TaskRecordPreview.test.ts b/src/modules/record/components/TaskRecordPreview.test.ts
index d7e17f3..92ca2a2 100644
--- a/src/modules/record/components/TaskRecordPreview.test.ts
+++ b/src/modules/record/components/TaskRecordPreview.test.ts
@@ -27,7 +27,6 @@ const mountTaskRecordPreview = (withRecord = false) => {
       'task-store': { tasks: [task] },
       'task-record-store': withRecord
         ? {
-            currentStepId: null,
             records: {
               [task.id]: record
             }
diff --git a/src/modules/record/interfaces/recordable.fixture.ts b/src/modules/record/interfaces/recordable.fixture.ts
index 2172763..cd13c4f 100644
--- a/src/modules/record/interfaces/recordable.fixture.ts
+++ b/src/modules/record/interfaces/recordable.fixture.ts
@@ -14,5 +14,6 @@ export const fixtureRecordable = (
       start: toISODate(faker.datatype.datetime())
     }
   },
+  currentStepId: null,
   end: partialRecordable?.end
 })
diff --git a/src/modules/record/interfaces/recordable.ts b/src/modules/record/interfaces/recordable.ts
index d4ecc1b..7fd3390 100644
--- a/src/modules/record/interfaces/recordable.ts
+++ b/src/modules/record/interfaces/recordable.ts
@@ -8,4 +8,5 @@ export interface Recordable {
   stepRecords: Record<string, TimeRange>
   notes: string
   breakTime?: TimeRange
+  currentStepId: string | null
 }
diff --git a/src/modules/record/models/task-record.test.ts b/src/modules/record/models/task-record.test.ts
index 9c26293..d3046d5 100644
--- a/src/modules/record/models/task-record.test.ts
+++ b/src/modules/record/models/task-record.test.ts
@@ -2,12 +2,13 @@ import { toISODate } from '@/shared/types/date'
 import { faker } from '@faker-js/faker'
 import { describe, expect, it } from 'vitest'
 import type { Recordable } from '../interfaces/recordable'
+import { fixtureRecordable } from '../interfaces/recordable.fixture'
 import { fixtureTimeRange } from '../interfaces/time-range.fixture'
 import { TaskRecord } from './task-record'
 
 describe('Task Record', () => {
   it('creates a Record from a Recordable', () => {
-    const recordable: Recordable = {
+    const recordable: Recordable = fixtureRecordable({
       taskId: faker.datatype.uuid(),
       notes: faker.lorem.paragraphs(),
       start: toISODate(faker.date.past(1)),
@@ -16,7 +17,7 @@ describe('Task Record', () => {
       stepRecords: {
         [faker.datatype.uuid()]: fixtureTimeRange()
       }
-    }
+    })
 
     expect(TaskRecord.fromRecordable(recordable)).toEqual(recordable)
   })
diff --git a/src/modules/record/models/task-record.ts b/src/modules/record/models/task-record.ts
index 051d6cc..e2607cf 100644
--- a/src/modules/record/models/task-record.ts
+++ b/src/modules/record/models/task-record.ts
@@ -8,6 +8,7 @@ export class TaskRecord implements Recordable {
   public stepRecords: Record<string, TimeRange> = {}
   public notes = ''
   public breakTime?: TimeRange
+  public currentStepId: string | null = null
 
   public constructor(public readonly taskId: string) {}
 
@@ -19,6 +20,7 @@ export class TaskRecord implements Recordable {
     const taskRecord = new TaskRecord(recordable.taskId)
 
     taskRecord.stepRecords = recordable.stepRecords
+    taskRecord.currentStepId = recordable.currentStepId
     taskRecord.start = recordable.start
     taskRecord.end = recordable.end
     taskRecord.breakTime = recordable.breakTime
diff --git a/src/modules/record/stores/useTaskRecordStore.ts b/src/modules/record/stores/useTaskRecordStore.ts
index 97b59a8..bdb033f 100644
--- a/src/modules/record/stores/useTaskRecordStore.ts
+++ b/src/modules/record/stores/useTaskRecordStore.ts
@@ -6,14 +6,12 @@ import { TaskRecord } from '../models/task-record'
 import { addBreakTimeToStepRecords } from '../services/breaktime-service'
 
 export interface TaskRecordStoreState {
-  currentStepId: string | null
   records: { [recordId: string]: Recordable }
 }
 
 export const useTaskRecordStore = defineStore('task-record-store', {
   persist: true,
   state: (): TaskRecordStoreState => ({
-    currentStepId: null,
     records: {}
   }),
   actions: {
@@ -57,10 +55,10 @@ export const useTaskRecordStore = defineStore('task-record-store', {
               [params.stepId]: {
                 start: params.start
               }
-            }
+            },
+            currentStepId: params.stepId
           }
-        },
-        currentStepId: params.stepId
+        }
       })
     },
     endStepRecord(params: { taskId: string; stepId: string; end: ISODate }) {
@@ -101,7 +99,7 @@ export const useTaskRecordStore = defineStore('task-record-store', {
       }
 
       this.records[taskId].end = toISODate(new Date())
-      this.currentStepId = null
+      this.records[taskId].currentStepId = null
     },
     updateRecordNotes(taskId: string, notes: string) {
       const record = this.records[taskId]
@@ -119,12 +117,12 @@ export const useTaskRecordStore = defineStore('task-record-store', {
       }
     },
     reset(taskId: string) {
-      this.currentStepId = null
       if (!this.records[taskId]) {
         return
       }
       this.records[taskId].stepRecords = {}
       this.records[taskId].end = undefined
+      this.records[taskId].currentStepId = null
     },
     pause(taskId: string) {
       if (this.records[taskId]?.breakTime) {
diff --git a/src/tests/utils.ts b/src/tests/utils.ts
index 5c26877..6476841 100644
--- a/src/tests/utils.ts
+++ b/src/tests/utils.ts
@@ -1,3 +1,4 @@
+import { fixtureRecordable } from '@/modules/record/interfaces/recordable.fixture'
 import type { TaskRecordStoreState } from '@/modules/record/stores/useTaskRecordStore'
 import { fixtureTask } from '@/modules/task/models/task.fixture'
 import type { TaskStoreState } from '@/modules/task/stores/useTask.store'
@@ -18,20 +19,19 @@ const [firstTask, secondTask] = tasks
 const initialState: InitialState = {
   'task-store': { tasks },
   'task-record-store': {
-    currentStepId: null,
     records: {
-      [firstTask.id]: {
+      [firstTask.id]: fixtureRecordable({
         taskId: firstTask.id,
         stepRecords: {},
         start: toISODate(new Date()),
         notes: ''
-      },
-      [secondTask.id]: {
+      }),
+      [secondTask.id]: fixtureRecordable({
         taskId: secondTask.id,
         stepRecords: {},
         start: toISODate(new Date()),
         notes: ''
-      }
+      })
     }
   }
 }