diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
index 5b8e9e6678..df82d8cd00 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
@@ -315,14 +315,14 @@ namespace Volo.Abp.EntityFrameworkCore
                     continue;
                 }
 
+                var entryProperty = entry.Property(property.Name);
                 var entityProperty = entity.GetProperty(property.Name);
                 if (entityProperty == null)
                 {
+                    entryProperty.CurrentValue = null;
                     continue;
                 }
 
-                var entryProperty = entry.Property(property.Name);
-
                 if (entryProperty.Metadata.ClrType == entityProperty.GetType())
                 {
                     entryProperty.CurrentValue = entityProperty;
diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Domain/ExtraProperties_Tests.cs b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Domain/ExtraProperties_Tests.cs
index 1f68a29514..dcca4a2003 100644
--- a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Domain/ExtraProperties_Tests.cs
+++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Domain/ExtraProperties_Tests.cs
@@ -24,11 +24,13 @@ namespace Volo.Abp.EntityFrameworkCore.Domain
 
             london.ExtraProperties["PhoneCode"] = 123456;
             london.ExtraProperties["Rank"] = "88";
+            london.ExtraProperties["ZipCode"] = null;
             await CityRepository.UpdateAsync(london);
 
             var london2 = await CityRepository.FindByNameAsync("London");
             london2.GetProperty<string>("PhoneCode").ShouldBe("123456");
             london2.GetProperty<int>("Rank").ShouldBe(88);
+            london2.GetProperty<string>("ZipCode").ShouldBe(null);
         }
     }
 }
diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Domain/TestEntityExtensionConfigurator.cs b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Domain/TestEntityExtensionConfigurator.cs
index 7c6f5d9576..783fba1b60 100644
--- a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Domain/TestEntityExtensionConfigurator.cs
+++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Domain/TestEntityExtensionConfigurator.cs
@@ -16,6 +16,8 @@ namespace Volo.Abp.EntityFrameworkCore.Domain
                     .MapEfCoreProperty<City, string>(
                         "PhoneCode",
                         p => p.HasMaxLength(8)
+                    ).MapEfCoreProperty<City, string>(
+                        "ZipCode"
                     ).MapEfCoreProperty<City, int>(
                         "Rank"
                     );
diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestDataBuilder.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestDataBuilder.cs
index 312125d541..4b5f390d85 100644
--- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestDataBuilder.cs
+++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestDataBuilder.cs
@@ -46,7 +46,15 @@ namespace Volo.Abp.TestApp
 
             await _cityRepository.InsertAsync(new City(Guid.NewGuid(), "Tokyo"));
             await _cityRepository.InsertAsync(new City(Guid.NewGuid(), "Madrid"));
-            await _cityRepository.InsertAsync(new City(LondonCityId, "London") { ExtraProperties = { { "Population", 10_470_000 }, { "PhoneCode", "42" } } });
+            await _cityRepository.InsertAsync(new City(LondonCityId, "London")
+            {
+                ExtraProperties =
+                {
+                    { "Population", 10_470_000 },
+                    { "PhoneCode", "42" },
+                    { "ZipCode", "1000" }
+                }
+            });
             await _cityRepository.InsertAsync(istanbul);
             await _cityRepository.InsertAsync(new City(Guid.NewGuid(), "Paris"));
             await _cityRepository.InsertAsync(new City(Guid.NewGuid(), "Washington"));
@@ -79,4 +87,4 @@ namespace Volo.Abp.TestApp
             await _entityWithIntPksRepository.InsertAsync(new EntityWithIntPk("Entity1"));
         }
     }
-}
\ No newline at end of file
+}