diff --git a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs index 3d5f6d5a57..3611085ff3 100644 --- a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs +++ b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs @@ -397,7 +397,7 @@ namespace Avalonia.Rendering } var oldScene = Interlocked.Exchange(ref _scene, scene); - oldScene.Dispose(); + oldScene?.Dispose(); _dirty.Clear(); (_root as IRenderRoot)?.Invalidate(new Rect(scene.Size)); @@ -405,7 +405,7 @@ namespace Avalonia.Rendering else { var oldScene = Interlocked.Exchange(ref _scene, null); - oldScene.Dispose(); + oldScene?.Dispose(); } } finally