diff --git a/src/Avalonia.Controls/Presenters/ItemVirtualizer.cs b/src/Avalonia.Controls/Presenters/ItemVirtualizer.cs index 964ce82849..ae198dc58c 100644 --- a/src/Avalonia.Controls/Presenters/ItemVirtualizer.cs +++ b/src/Avalonia.Controls/Presenters/ItemVirtualizer.cs @@ -185,8 +185,12 @@ namespace Avalonia.Controls.Presenters /// public virtual void Dispose() { - VirtualizingPanel.Controller = null; - VirtualizingPanel.Children.Clear(); + if (VirtualizingPanel != null) + { + VirtualizingPanel.Controller = null; + VirtualizingPanel.Children.Clear(); + } + Owner.ItemContainerGenerator.Clear(); }