diff --git a/ems-core/src/main/java/it/integry/security/service/RefreshTokenService.java b/ems-core/src/main/java/it/integry/security/service/RefreshTokenService.java
index d563344645..b71859694a 100644
--- a/ems-core/src/main/java/it/integry/security/service/RefreshTokenService.java
+++ b/ems-core/src/main/java/it/integry/security/service/RefreshTokenService.java
@@ -145,11 +145,8 @@ public class RefreshTokenService {
 
 
     private UsernamePasswordAuthenticationToken createAuthenticationToken(String username, String password, Integer keyGroup, long deviceId) throws PrimaryDatabaseNotPresentException {
-        ImmutableList<SimpleGrantedAuthority> simpleGrantedAuthorities = null;
-
-        if (keyGroup != null) {
-            simpleGrantedAuthorities = ImmutableList.of(new SimpleGrantedAuthority(String.valueOf(keyGroup)));
-        }
+        ImmutableList<SimpleGrantedAuthority> simpleGrantedAuthorities =
+                ImmutableList.of(new SimpleGrantedAuthority(String.valueOf(keyGroup)));
 
         UsernamePasswordAuthenticationToken authenticationToken =
                 new UsernamePasswordAuthenticationToken(username, password, simpleGrantedAuthorities);