diff --git a/src/main/java/clap/server/domain/model/task/Task.java b/src/main/java/clap/server/domain/model/task/Task.java
index 97c2db2e..0352b2e0 100644
--- a/src/main/java/clap/server/domain/model/task/Task.java
+++ b/src/main/java/clap/server/domain/model/task/Task.java
@@ -71,6 +71,9 @@ public void updateTaskStatus(TaskStatus status) {
         if (status.equals(TaskStatus.COMPLETED)) {
             this.finishedAt = LocalDateTime.now();
         }
+        if (this.taskStatus == TaskStatus.TERMINATED || this.taskStatus == TaskStatus.COMPLETED) {
+            this.finishedAt = null;
+        }
         this.taskStatus = status;
     }