diff --git a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/MDCHandler.java b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/MDCHandler.java
index 57563b6c7..e70dbd971 100644
--- a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/MDCHandler.java
+++ b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/MDCHandler.java
@@ -57,6 +57,10 @@ public class MDCHandler {
         }
 
         final Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        if (authentication == null) {
+            return callable.call();
+        }
+
         final String tenant;
         if (authentication.getDetails() instanceof TenantAwareAuthenticationDetails tenantAwareAuthenticationDetails) {
             tenant = tenantAwareAuthenticationDetails.getTenant();