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);