diff --git a/src/main/java/io/wcm/handler/mediasource/ngdm/impl/metadata/NextGenDynamicMediaMetadataServiceImpl.java b/src/main/java/io/wcm/handler/mediasource/ngdm/impl/metadata/NextGenDynamicMediaMetadataServiceImpl.java
index b036af1f..56896cf8 100644
--- a/src/main/java/io/wcm/handler/mediasource/ngdm/impl/metadata/NextGenDynamicMediaMetadataServiceImpl.java
+++ b/src/main/java/io/wcm/handler/mediasource/ngdm/impl/metadata/NextGenDynamicMediaMetadataServiceImpl.java
@@ -148,8 +148,8 @@ private void activate(Config config) {
       if (log.isTraceEnabled()) {
         log.trace("Authentication configuration: imsTokenApiUrl={}, authenticationClientId={}, authenticationClientSecret={}, authenticationScope={}",
             StringUtils.defaultString(imsTokenApiUrl),
-            StringUtils.repeat('*', authenticationClientId.length()),
-            StringUtils.repeat('*', authenticationClientSecret.length()),
+            StringUtils.isNotBlank(authenticationClientId) ? "***" : "",
+            StringUtils.isNotBlank(authenticationClientSecret) ? "***" : "",
             StringUtils.defaultString(authenticationScope));
       }
       if (StringUtils.isNoneBlank(imsTokenApiUrl, authenticationClientId, authenticationClientSecret, authenticationScope)) {