diff --git a/jams-server/src/main/java/net/jami/jams/server/servlets/filters/FilterUtils.java b/jams-server/src/main/java/net/jami/jams/server/servlets/filters/FilterUtils.java
index 9d2482cfa77986ea7ab7b556d175d45b619ae4c1..6f3b4dcdb19db1e79d27191f6eb4f07ef5f3bd09 100644
--- a/jams-server/src/main/java/net/jami/jams/server/servlets/filters/FilterUtils.java
+++ b/jams-server/src/main/java/net/jami/jams/server/servlets/filters/FilterUtils.java
@@ -88,8 +88,8 @@ public class FilterUtils {
                 StatementElement statementElement = new StatementElement("username", "=", token.getJWTClaimsSet().getSubject(), "");
                 statementList.addStatement(statementElement);
                 User user =  dataStore.getUserDao().getObjects(statementList).get(0);
-                if(certificateAuthority.getLatestCRL().get() != null) {
-                    if(!user.getAccessLevelName().equals("ADMIN") && certificateAuthority.getLatestCRL().get().getRevokedCertificate(user.getCertificate().getSerialNumber()) != null)
+                if(!user.getAccessLevelName().equals("ADMIN") && certificateAuthority.getLatestCRL().get() != null) {
+                    if(certificateAuthority.getLatestCRL().get().getRevokedCertificate(user.getCertificate().getSerialNumber()) != null)
                         return false;
                 }
                 JWSVerifier jwsVerifier = new RSASSAVerifier(userAuthenticationModule.getAuthModulePubKey());