diff --git a/src/Avalonia.Controls/Presenters/ContentPresenter.cs b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
index 54d7e76d73..ca02a0505c 100644
--- a/src/Avalonia.Controls/Presenters/ContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
@@ -277,6 +277,11 @@ namespace Avalonia.Controls.Presenters
 
                 Child = newChild;
 
+                if (oldChild?.LogicalParent == this)
+                {
+                    ((ISetLogicalParent)oldChild).SetParent(null);
+                }
+
                 if (newChild.Parent == null)
                 {
                     ((ISetLogicalParent)newChild).SetParent((ILogical)this.TemplatedParent ?? this);