diff --git a/iam-login-service/src/main/java/it/infn/mw/iam/api/client/service/DefaultClientService.java b/iam-login-service/src/main/java/it/infn/mw/iam/api/client/service/DefaultClientService.java
index 51e75a488..48de8fd4c 100644
--- a/iam-login-service/src/main/java/it/infn/mw/iam/api/client/service/DefaultClientService.java
+++ b/iam-login-service/src/main/java/it/infn/mw/iam/api/client/service/DefaultClientService.java
@@ -137,8 +137,8 @@ public void deleteClient(ClientDetailsEntity client) {
   }
 
   private boolean isValidAccessToken(OAuth2AccessTokenEntity a) {
-    return !(a.getAuthenticationHolder().getScope().contains("registration-token")
-        || a.getAuthenticationHolder().getScope().contains("resource-token"));
+    return !(a.getScope().contains("registration-token")
+        || a.getScope().contains("resource-token"));
   }
 
   private void deleteTokensByClient(ClientDetailsEntity client) {