From b4512e0da8f2334b1a1b2826e600f2386a30a4af Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Thu, 30 Jun 2022 00:05:10 +0300
Subject: [PATCH] Clear the draw list before letting go of the visual

---
 src/Avalonia.Base/Visual.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Base/Visual.cs b/src/Avalonia.Base/Visual.cs
index 7db218d2df..716b5f261d 100644
--- a/src/Avalonia.Base/Visual.cs
+++ b/src/Avalonia.Base/Visual.cs
@@ -495,7 +495,12 @@ namespace Avalonia
 
             DisableTransitions();
             OnDetachedFromVisualTree(e);
-            CompositionVisual = null;
+            if (CompositionVisual != null)
+            {
+                CompositionVisual.DrawList = null;
+                CompositionVisual = null;
+            }
+
             DetachedFromVisualTree?.Invoke(this, e);
             e.Root?.Renderer?.AddDirty(this);