diff --git a/src/main/java/eu/dnetlib/repo/manager/service/security/AaiRoleMappingService.java b/src/main/java/eu/dnetlib/repo/manager/service/security/AaiRoleMappingService.java
index d7ec93d..de89483 100644
--- a/src/main/java/eu/dnetlib/repo/manager/service/security/AaiRoleMappingService.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/security/AaiRoleMappingService.java
@@ -53,7 +53,7 @@ public class AaiRoleMappingService implements RoleMappingService {
     @Override
     public String getRoleIdByRepoId(String repoId) {
         String roleId = "";
-        String prefix = production ? null : "beta." + "datasource";
+        String prefix = (production ? "" : "beta.") + "datasource";
         if (repoId != null) {
             roleId = createRepoRoleName(prefix, repoId);
             return roleId;