diff --git a/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
index 1047c4317d..b0eeacacd9 100644
--- a/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
@@ -156,6 +156,7 @@ namespace Umbraco.Web.PropertyEditors
             public override object ToEditor(Property property, IDataTypeService dataTypeService, string culture = null, string segment = null)
             {
                 var val = property.GetValue(culture, segment);
+                var valEditors = new Dictionary<int, IDataValueEditor>();
 
                 var rows = _nestedContentValues.GetPropertyValues(val);
 
@@ -184,8 +185,15 @@ namespace Umbraco.Web.PropertyEditors
                                 continue;
                             }
 
-                            var tempConfig = dataTypeService.GetDataType(prop.Value.PropertyType.DataTypeId).Configuration;
-                            var valEditor = propEditor.GetValueEditor(tempConfig);
+                            var dataTypeId = prop.Value.PropertyType.DataTypeId;
+                            if (!valEditors.TryGetValue(dataTypeId, out var valEditor))
+                            {
+                                var tempConfig = dataTypeService.GetDataType(dataTypeId).Configuration;
+                                valEditor = propEditor.GetValueEditor(tempConfig);
+
+                                valEditors.Add(dataTypeId, valEditor);
+                            }
+
                             var convValue = valEditor.ToEditor(tempProp, dataTypeService);
 
                             // update the raw value since this is what will get serialized out