diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/ConcurrencyStampConsts.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/ConcurrencyStampConsts.cs
new file mode 100644
index 0000000000..ac655a395d
--- /dev/null
+++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/ConcurrencyStampConsts.cs
@@ -0,0 +1,7 @@
+namespace Volo.Abp.Domain.Entities
+{
+    public static class ConcurrencyStampConsts
+    {
+        public const int MaxLength = 40;
+    }
+}
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Modeling/AbpEntityTypeBuilderExtensions.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Modeling/AbpEntityTypeBuilderExtensions.cs
index 0a84b6871d..44962eca4c 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Modeling/AbpEntityTypeBuilderExtensions.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Modeling/AbpEntityTypeBuilderExtensions.cs
@@ -40,9 +40,9 @@ namespace Volo.Abp.EntityFrameworkCore.Modeling
         {
             if (b.Metadata.ClrType.IsAssignableTo<IHasConcurrencyStamp>())
             {
-                //TODO: Max length?
                 b.Property(nameof(IHasConcurrencyStamp.ConcurrencyStamp))
                     .IsConcurrencyToken()
+                    .HasMaxLength(ConcurrencyStampConsts.MaxLength)
                     .HasColumnName(nameof(IHasConcurrencyStamp.ConcurrencyStamp));
             }
         }
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/IdentityClaimTypeConsts.cs b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/IdentityClaimTypeConsts.cs
index 32e3197e12..d3ceb03812 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/IdentityClaimTypeConsts.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/IdentityClaimTypeConsts.cs
@@ -6,6 +6,5 @@
         public const int MaxRegexLength = 512;
         public const int MaxRegexDescriptionLength = 128;
         public const int MaxDescriptionLength = 256;
-        public const int MaxConcurrencyStampLength = 256;
     }
 }
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/IdentityRoleConsts.cs b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/IdentityRoleConsts.cs
index cac33aa53d..11bde27f34 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/IdentityRoleConsts.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/IdentityRoleConsts.cs
@@ -4,6 +4,5 @@
     {
         public const int MaxNameLength = 256;
         public const int MaxNormalizedNameLength = MaxNameLength;
-        public const int MaxConcurrencyStampLength = 256;
     }
 }
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/IdentityUserConsts.cs b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/IdentityUserConsts.cs
index ef2cc57ef4..921a409272 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/IdentityUserConsts.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/IdentityUserConsts.cs
@@ -23,7 +23,5 @@ namespace Volo.Abp.Identity
         public const int MaxPasswordHashLength = 256;
 
         public const int MaxSecurityStampLength = 256;
-
-        public const int MaxConcurrencyStampLength = 256;
     }
 }
diff --git a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityDbContextModelBuilderExtensions.cs b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityDbContextModelBuilderExtensions.cs
index 74cc2ce995..000a2a8f00 100644
--- a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityDbContextModelBuilderExtensions.cs
+++ b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityDbContextModelBuilderExtensions.cs
@@ -126,9 +126,6 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
 
                 b.Property(r => r.Name).IsRequired().HasMaxLength(IdentityRoleConsts.MaxNameLength);
                 b.Property(r => r.NormalizedName).IsRequired().HasMaxLength(IdentityRoleConsts.MaxNormalizedNameLength);
-                b.Property(u => u.ConcurrencyStamp).IsRequired().IsConcurrencyToken()
-                    .HasMaxLength(IdentityRoleConsts.MaxConcurrencyStampLength)
-                    .HasColumnName(nameof(IdentityRole.ConcurrencyStamp));
                 b.Property(r => r.IsDefault).HasColumnName(nameof(IdentityRole.IsDefault));
                 b.Property(r => r.IsStatic).HasColumnName(nameof(IdentityRole.IsStatic));
                 b.Property(r => r.IsPublic).HasColumnName(nameof(IdentityRole.IsPublic));
@@ -163,9 +160,6 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
                 b.Property(uc => uc.Regex).HasMaxLength(IdentityClaimTypeConsts.MaxRegexLength);
                 b.Property(uc => uc.RegexDescription).HasMaxLength(IdentityClaimTypeConsts.MaxRegexDescriptionLength);
                 b.Property(uc => uc.Description).HasMaxLength(IdentityClaimTypeConsts.MaxDescriptionLength);
-                b.Property(uc => uc.ConcurrencyStamp).IsRequired().IsConcurrencyToken()
-                    .HasMaxLength(IdentityClaimTypeConsts.MaxConcurrencyStampLength)
-                    .HasColumnName(nameof(IdentityClaimType.ConcurrencyStamp));
             });
 
             builder.Entity<OrganizationUnit>(b =>