diff --git a/src/main/java/br/com/luizcarlosvianamelo/keycloak/broker/oidc/mappers/ClaimToGroupMapper.java b/src/main/java/br/com/luizcarlosvianamelo/keycloak/broker/oidc/mappers/ClaimToGroupMapper.java
index e755363..b1f4b88 100644
--- a/src/main/java/br/com/luizcarlosvianamelo/keycloak/broker/oidc/mappers/ClaimToGroupMapper.java
+++ b/src/main/java/br/com/luizcarlosvianamelo/keycloak/broker/oidc/mappers/ClaimToGroupMapper.java
@@ -143,6 +143,9 @@ public class ClaimToGroupMapper extends AbstractClaimMapper {
         if (!List.class.isAssignableFrom(roles.getClass())) {
             newList.add(roles.toString());
         }
+        else {
+            newList = roles;
+        }
         return newList;
     }