diff --git a/src/Avalonia.Styling/LogicalTree/ControlLocator.cs b/src/Avalonia.Styling/LogicalTree/ControlLocator.cs
index e89bf55404..501a26c848 100644
--- a/src/Avalonia.Styling/LogicalTree/ControlLocator.cs
+++ b/src/Avalonia.Styling/LogicalTree/ControlLocator.cs
@@ -57,7 +57,10 @@ namespace Avalonia.LogicalTree
             private void Detached(object sender, LogicalTreeAttachmentEventArgs e)
             {
                 _value = null;
-              //  PublishNext(null);
+                if (_relativeTo.IsAttachedToLogicalTree)
+                {
+                    PublishNext(null);
+                }
             }
 
             private void Update()