diff --git a/src/Umbraco.Core/Persistence/Factories/PropertyFactory.cs b/src/Umbraco.Core/Persistence/Factories/PropertyFactory.cs
index 2dd018ac55..0ab8136d3e 100644
--- a/src/Umbraco.Core/Persistence/Factories/PropertyFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/PropertyFactory.cs
@@ -32,13 +32,19 @@ namespace Umbraco.Core.Persistence.Factories
         public IEnumerable<Property> BuildEntity(IEnumerable<PropertyDataDto> dtos)
         {
             var properties = new List<Property>();
+
             foreach (var dto in dtos)
             {
-                var propertyType = _contentType.CompositionPropertyTypes.FirstOrDefault(x => x.Id == dto.PropertyTypeId);
-                var property = propertyType.CreatePropertyFromRawValue(dto.GetValue, dto.VersionId.Value, dto.Id);
-                property.ResetDirtyProperties();
-                properties.Add(property);
+                if (_contentType.CompositionPropertyTypes.Any(x => x.Id == dto.PropertyTypeId))
+                {
+                    var propertyType = _contentType.CompositionPropertyTypes.First(x => x.Id == dto.PropertyTypeId);
+                    var property = propertyType.CreatePropertyFromRawValue(dto.GetValue, dto.VersionId.Value, dto.Id);
+
+                    property.ResetDirtyProperties();
+                    properties.Add(property);
+                }
             }
+
             return properties;
         }