diff --git a/src/main/java/org/blueline/api/service/ChallengeService.java b/src/main/java/org/blueline/api/service/ChallengeService.java
index 3169b1a..5343a2c 100644
--- a/src/main/java/org/blueline/api/service/ChallengeService.java
+++ b/src/main/java/org/blueline/api/service/ChallengeService.java
@@ -111,8 +111,8 @@ private void mapDtoToEntity(ChallengeDto dto, Challenge entity) {
 
     private ChallengeDto mapEntityToDto(Challenge entity) {
         ChallengeDto dto = new ChallengeDto();
-        // dto.setId(entity.getId());
-        // dto.setEventId(entity.getEvent() != null ? entity.getEvent().getId() : null);
+        dto.setId(entity.getId());
+        dto.setEventId(entity.getEvent() != null ? entity.getEvent().getId() : null);
         dto.setName(entity.getName());
         dto.setDescription(entity.getDescription());
         dto.setStartDate(entity.getStartDate());