diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/LegacyMediaPickerPropertyConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/LegacyMediaPickerPropertyConverter.cs index 8ef11bec8d..1f9291d629 100644 --- a/src/Umbraco.Web/PropertyEditors/ValueConverters/LegacyMediaPickerPropertyConverter.cs +++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/LegacyMediaPickerPropertyConverter.cs @@ -85,6 +85,9 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters /// public override object ConvertDataToSource(PublishedPropertyType propertyType, object source, bool preview) { + if (source == null) + return null; + if (IsMultipleDataType(propertyType.DataTypeId, propertyType.PropertyEditorAlias)) { var nodeIds =