diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ChangeTrackers/AbpEfCoreNavigationHelper.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ChangeTrackers/AbpEfCoreNavigationHelper.cs
index bdea524940..5ee3ce7aaf 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ChangeTrackers/AbpEfCoreNavigationHelper.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ChangeTrackers/AbpEfCoreNavigationHelper.cs
@@ -156,7 +156,7 @@ public class AbpEfCoreNavigationHelper : ITransientDependency
         return EntityEntries.TryGetValue(entryId, out var abpEntityEntry) && abpEntityEntry.IsModified;
     }
 
-    public virtual bool IsNavigationEntryModified(EntityEntry entityEntry, NavigationEntry navigationEntry, int index)
+    public virtual bool IsNavigationEntryModified(EntityEntry entityEntry,  int navigationEntryIndex)
     {
         var entryId = GetEntityId(entityEntry);
         if (entryId == null)
@@ -169,7 +169,7 @@ public class AbpEfCoreNavigationHelper : ITransientDependency
             return false;
         }
 
-        var navigationEntryProperty = abpEntityEntry.NavigationEntries.ElementAtOrDefault(index);
+        var navigationEntryProperty = abpEntityEntry.NavigationEntries.ElementAtOrDefault(navigationEntryIndex);
         return navigationEntryProperty != null && navigationEntryProperty.IsModified;
     }
 
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/EntityHistory/EntityHistoryHelper.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/EntityHistory/EntityHistoryHelper.cs
index 49a25601a4..a52ac2f437 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/EntityHistory/EntityHistoryHelper.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/EntityHistory/EntityHistoryHelper.cs
@@ -195,10 +195,9 @@ public class EntityHistoryHelper : IEntityHistoryHelper, ITransientDependency
 
         if (Options.SaveEntityHistoryWhenNavigationChanges && AbpEfCoreNavigationHelper != null)
         {
-            var index = 0;
-            foreach (var navigationEntry in entityEntry.Navigations)
+            foreach (var (navigationEntry, index) in entityEntry.Navigations.Select((value, i) => ( value, i )))
             {
-                if (AbpEfCoreNavigationHelper.IsNavigationEntryModified(entityEntry, navigationEntry, index))
+                if (AbpEfCoreNavigationHelper.IsNavigationEntryModified(entityEntry, index))
                 {
                     propertyChanges.Add(new EntityPropertyChangeInfo
                     {
@@ -206,8 +205,6 @@ public class EntityHistoryHelper : IEntityHistoryHelper, ITransientDependency
                         PropertyTypeFullName = navigationEntry.Metadata.ClrType.GetFirstGenericArgumentIfNullable().FullName!
                     });
                 }
-
-                index++;
             }
         }