diff --git a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs
index 3351a81f..2849f410 100644
--- a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs
+++ b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs
@@ -322,10 +322,10 @@ namespace Oqtane.Repository
                 permission.EntityName = p.EntityName;
                 permission.EntityId = p.EntityId;
                 permission.PermissionName = p.PermissionName;
-                permission.RoleId = p.RoleId;
+                permission.RoleId = null;
                 permission.RoleName = p.RoleName;
                 permission.UserId = p.UserId;
-                permission.IsAuthorized = p.IsAuthorized; 
+                permission.IsAuthorized = p.IsAuthorized;
                 permissions.Add(permission);
             }
             return permissions;
diff --git a/Oqtane.Server/Repository/PermissionRepository.cs b/Oqtane.Server/Repository/PermissionRepository.cs
index 44b04fa1..aad7547b 100644
--- a/Oqtane.Server/Repository/PermissionRepository.cs
+++ b/Oqtane.Server/Repository/PermissionRepository.cs
@@ -93,11 +93,7 @@ namespace Oqtane.Repository
                 permission.EntityId = (permission.EntityName == entityName) ? entityId : -1;
                 if (permission.UserId == null && permission.RoleId == null && !string.IsNullOrEmpty(permission.RoleName))
                 {
-                    var role = roles.FirstOrDefault(item => item.Name == permission.RoleName);
-                    if (role != null)
-                    {
-                        permission.RoleId = role.RoleId;
-                    }
+                    permission.RoleId = roles.FirstOrDefault(item => item.Name == permission.RoleName)?.RoleId;
                 }
             }
             // add or update permissions