diff --git a/Oqtane.Server/Repository/RoleRepository.cs b/Oqtane.Server/Repository/RoleRepository.cs
index 9dd27988..f41cc31f 100644
--- a/Oqtane.Server/Repository/RoleRepository.cs
+++ b/Oqtane.Server/Repository/RoleRepository.cs
@@ -26,7 +26,7 @@ namespace Oqtane.Repository
 
         public Role AddRole(Role role)
         {
-            role.Description = role.Description.Substring(0, 256);
+            role.Description = role.Description.Substring(0, (role.Description.Length > 256) ? 256 : role.Description.Length);
             _db.Role.Add(role);
             _db.SaveChanges();
             return role;
@@ -34,7 +34,7 @@ namespace Oqtane.Repository
 
         public Role UpdateRole(Role role)
         {
-            role.Description = role.Description.Substring(0, 256);
+            role.Description = role.Description.Substring(0, (role.Description.Length > 256) ? 256 : role.Description.Length);
             _db.Entry(role).State = EntityState.Modified;
             _db.SaveChanges();
             return role;