diff --git a/src/controllers/WorkflowController.ts b/src/controllers/WorkflowController.ts
index 24710642..c8757430 100644
--- a/src/controllers/WorkflowController.ts
+++ b/src/controllers/WorkflowController.ts
@@ -339,6 +339,17 @@ export class WorkflowController extends Controller {
       system: string;
     },
   ) {
+    const stateOperatorUserNow = await this.stateOperatorUserRepo.findOne({
+      where: {
+        workflow: {
+          refId: body.refId,
+          sysName: body.system,
+        },
+        profile: {
+          keycloak: req.user.sub,
+        },
+      },
+    });
     const stateOperatorUser = await this.stateOperatorUserRepo.find({
       where: {
         workflow: {
@@ -348,6 +359,7 @@ export class WorkflowController extends Controller {
         profile: {
           keycloak: Not(req.user.sub),
         },
+        operator: stateOperatorUserNow?.operator || "",
       },
     });
     await this.stateOperatorUserRepo.remove(stateOperatorUser);
diff --git a/src/entities/StateOperatorUser.ts b/src/entities/StateOperatorUser.ts
index 6d5c4294..2fb40199 100644
--- a/src/entities/StateOperatorUser.ts
+++ b/src/entities/StateOperatorUser.ts
@@ -1,6 +1,5 @@
-import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from "typeorm";
+import { Entity, Column, ManyToOne, JoinColumn } from "typeorm";
 import { EntityBase } from "./base/Base";
-import { StateOperator } from "./StateOperator";
 import { Workflow } from "./Workflow";
 import { Profile } from "./Profile";