diff --git a/hawkbit-ddi/hawkbit-ddi-security/src/main/java/org/eclipse/hawkbit/security/controller/SecurityTokenAuthenticator.java b/hawkbit-ddi/hawkbit-ddi-security/src/main/java/org/eclipse/hawkbit/security/controller/SecurityTokenAuthenticator.java
index 9cfea827b..acec12423 100644
--- a/hawkbit-ddi/hawkbit-ddi-security/src/main/java/org/eclipse/hawkbit/security/controller/SecurityTokenAuthenticator.java
+++ b/hawkbit-ddi/hawkbit-ddi-security/src/main/java/org/eclipse/hawkbit/security/controller/SecurityTokenAuthenticator.java
@@ -64,7 +64,8 @@ public class SecurityTokenAuthenticator extends Authenticator.AbstractAuthentica
                                 : controllerManagement.getByControllerId(controllerSecurityToken.getControllerId()),
                         controllerSecurityToken.getTenant())
                 // validate if the presented token is the same as the one set for the target
-                .filter(target -> presentedToken.equals(target.getSecurityToken()))
+                .filter(target -> presentedToken.equals(
+                        systemSecurityContext.runAsSystemAsTenant(target::getSecurityToken, controllerSecurityToken.getTenant())))
                 .map(target -> authenticatedController(controllerSecurityToken.getTenant(), target.getControllerId()))
                 .orElse(null);
     }