diff --git a/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs
index 669255f948..65a841e499 100644
--- a/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs
+++ b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs
@@ -90,12 +90,6 @@ namespace Volo.Abp.Domain.Repositories.EntityFrameworkCore
         public override TEntity Update(TEntity entity)
         {
             DbContext.Attach(entity);
-
-            if (entity is IHasConcurrencyStamp)
-            {
-                (entity as IHasConcurrencyStamp).ConcurrencyStamp = Guid.NewGuid().ToString();
-            }
-
             return DbContext.Update(entity).Entity;
         }
 
diff --git a/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
index f7947068da..205042fedf 100644
--- a/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
+++ b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
@@ -1,8 +1,10 @@
-using System.Linq;
+using System;
+using System.Linq;
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Volo.Abp.Domain.Entities;
 using Volo.Abp.Uow;
@@ -30,26 +32,42 @@ namespace Volo.Abp.EntityFrameworkCore
 
         public override int SaveChanges(bool acceptAllChangesOnSuccess)
         {
+            ChangeTracker.DetectChanges();
+            ApplyAbpConcepts();
+
             try
             {
+                ChangeTracker.AutoDetectChangesEnabled = false;
                 return base.SaveChanges(acceptAllChangesOnSuccess);
             }
             catch (DbUpdateConcurrencyException ex)
             {
                 throw new AbpDbConcurrencyException(ex.Message, ex);
             }
+            finally
+            {
+                ChangeTracker.AutoDetectChangesEnabled = true;
+            }
         }
 
         public override async Task<int> SaveChangesAsync(bool acceptAllChangesOnSuccess, CancellationToken cancellationToken = default(CancellationToken))
         {
+            ChangeTracker.DetectChanges();
+            ApplyAbpConcepts();
+
             try
             {
+                ChangeTracker.AutoDetectChangesEnabled = false;
                 return await base.SaveChangesAsync(acceptAllChangesOnSuccess, cancellationToken);
             }
             catch (DbUpdateConcurrencyException ex)
             {
                 throw new AbpDbConcurrencyException(ex.Message, ex);
             }
+            finally
+            {
+                ChangeTracker.AutoDetectChangesEnabled = true;
+            }
         }
 
         protected virtual void ConfigureConcurrencyStamp(IMutableEntityType entityType)
@@ -64,5 +82,32 @@ namespace Volo.Abp.EntityFrameworkCore
                 .First(p => p.Name == nameof(IHasConcurrencyStamp.ConcurrencyStamp))
                 .IsConcurrencyToken = true;
         }
+
+        protected virtual void ApplyAbpConcepts()
+        {
+            /* Implement other concepts from ABP v1.x */
+
+            foreach (var entry in ChangeTracker.Entries())
+            {
+                switch (entry.State)
+                {
+                    case EntityState.Modified:
+                    case EntityState.Deleted:
+                        HandleConcurrencyStamp(entry);
+                        break;
+                }
+            }
+        }
+
+        protected virtual void HandleConcurrencyStamp(EntityEntry entry)
+        {
+            var entity = entry.Entity as IHasConcurrencyStamp;
+            if (entity == null)
+            {
+                return;
+            }
+
+            entity.ConcurrencyStamp = Guid.NewGuid().ToString();
+        }
     }
 }
\ No newline at end of file