diff --git a/src/main/java/de/unistuttgart/iste/meitrex/gamification_service/persistence/entity/achievements/userGoalProgress/UserGoalProgressEntity.java b/src/main/java/de/unistuttgart/iste/meitrex/gamification_service/persistence/entity/achievements/userGoalProgress/UserGoalProgressEntity.java
index fd85cc9a..dac1518e 100644
--- a/src/main/java/de/unistuttgart/iste/meitrex/gamification_service/persistence/entity/achievements/userGoalProgress/UserGoalProgressEntity.java
+++ b/src/main/java/de/unistuttgart/iste/meitrex/gamification_service/persistence/entity/achievements/userGoalProgress/UserGoalProgressEntity.java
@@ -47,6 +47,14 @@ public UserGoalProgressEntity(UserEntity user, GoalEntity goal) {
         startedAt = OffsetDateTime.now();
     }
 
+    public void setCompleted(boolean completed) {
+        boolean oldCompleted = this.completed;
+        this.completed = completed;
+        if (completed && !oldCompleted) {
+            endedAt = OffsetDateTime.now();
+        }
+    }
+
     public boolean updateProgress(GoalProgressEvent progressEvent) {
         return goal.updateProgress(progressEvent, this);
     }