diff --git a/src/main/java/net/geant/nmaas/portal/service/WebhookEventService.java b/src/main/java/net/geant/nmaas/portal/service/WebhookEventService.java
index 1de9d5b90555956d697207ab4d66098d339e6837..2a0be60f59facbd0d9040c6b0ca87779ab648c2f 100644
--- a/src/main/java/net/geant/nmaas/portal/service/WebhookEventService.java
+++ b/src/main/java/net/geant/nmaas/portal/service/WebhookEventService.java
@@ -36,10 +36,13 @@ public class WebhookEventService {
     }
 
     public WebhookEventDto update(WebhookEventDto webhookEventDto) throws GeneralSecurityException {
-        WebhookEvent webhookEvent = webhookRepository.findById(webhookEventDto.getId()).orElseThrow(() -> new MissingElementException(WEBHOOK_EVENT_NOT_FOUND));
+        WebhookEvent webhookEvent = webhookRepository.findById(webhookEventDto.getId())
+                .orElseThrow(() -> new MissingElementException(WEBHOOK_EVENT_NOT_FOUND));
         setWebhookEvent(webhookEvent, webhookEventDto);
         webhookEvent = webhookRepository.save(webhookEvent);
-        return modelMapper.map(webhookEvent, WebhookEventDto.class);
+        WebhookEventDto dto = modelMapper.map(webhookEvent, WebhookEventDto.class);
+        dto.setTokenValue(webhookEvent.getTokenValue() == null ? null : encryptionService.decrypt(webhookEvent.getTokenValue()));
+        return dto;
     }
 
     private void setWebhookEvent(WebhookEvent webhookEvent, WebhookEventDto webhookEventDto) throws GeneralSecurityException {
@@ -51,7 +54,8 @@ public class WebhookEventService {
     }
 
     public void remove(Long id) {
-        WebhookEvent webhookEvent = webhookRepository.findById(id).orElseThrow(() -> new MissingElementException(WEBHOOK_EVENT_NOT_FOUND));
+        WebhookEvent webhookEvent = webhookRepository.findById(id)
+                .orElseThrow(() -> new MissingElementException(WEBHOOK_EVENT_NOT_FOUND));
         webhookRepository.delete(webhookEvent);
     }