diff --git a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SecurityContextTenantAware.java b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SecurityContextTenantAware.java
index 989882755..e9ed5b15d 100644
--- a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SecurityContextTenantAware.java
+++ b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SecurityContextTenantAware.java
@@ -25,6 +25,7 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.context.SecurityContextImpl;
+import org.springframework.security.oauth2.core.oidc.user.OidcUser;
 
 /**
  * A {@link TenantAware} implementation which retrieves the ID of the tenant
@@ -75,6 +76,9 @@ public class SecurityContextTenantAware implements TenantAware {
             if (principal instanceof UserPrincipal) {
                 return ((UserPrincipal) principal).getUsername();
             }
+            if (principal instanceof OidcUser) {
+                return ((OidcUser) principal).getPreferredUsername();
+            }
         }
         return null;
     }