diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlObjectWriter.cs b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlObjectWriter.cs index f10de1a32f..860dbfec39 100644 --- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlObjectWriter.cs +++ b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlObjectWriter.cs @@ -88,8 +88,8 @@ namespace Avalonia.Markup.Xaml.PortableXaml //Portable.Xaml.ComponentModel.ISupportInitialize //and we have Avalonia.ISupportInitialize so we need some hacks HandleBeginInit(value); - - _delayedValuesHelper.BeginInit(value); + if (value != null) + _delayedValuesHelper.BeginInit(value); base.OnBeforeProperties(value); }