diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.test.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.test.ts
index bd0b84227c..ab80dcff04 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.test.ts
@@ -196,7 +196,7 @@ describe('DatabaseTaskStore', () => {
     await store.claimTask();
 
     const claimedTask = await store.getTask(taskId);
-    expect(claimedTask.state).toEqual({ state });
+    expect(claimedTask.state).toEqual({ state: state.state });
   });
 
   it('should shutdown the running task', async () => {
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts
index 68f76cd3e4..752108cf6e 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts
@@ -212,7 +212,7 @@ export class DatabaseTaskStore implements TaskStore {
     try {
       const spec = JSON.parse(result.spec);
       const secrets = result.secrets ? JSON.parse(result.secrets) : undefined;
-      const state = result.state ? JSON.parse(result.state) : undefined;
+      const state = result.state ? JSON.parse(result.state).state : undefined;
       return {
         id: result.id,
         spec,
@@ -272,7 +272,7 @@ export class DatabaseTaskStore implements TaskStore {
 
       const getState = () => {
         try {
-          return task.state ? JSON.parse(task.state) : undefined;
+          return task.state ? JSON.parse(task.state).state : undefined;
         } catch (error) {
           throw new Error(
             `Failed to parse state of the task '${task.id}', ${error}`,