diff --git a/src/Avalonia.Controls/Generators/TreeItemContainerGenerator.cs b/src/Avalonia.Controls/Generators/TreeItemContainerGenerator.cs
index 9200490668..22e06a40b1 100644
--- a/src/Avalonia.Controls/Generators/TreeItemContainerGenerator.cs
+++ b/src/Avalonia.Controls/Generators/TreeItemContainerGenerator.cs
@@ -127,7 +127,7 @@ namespace Avalonia.Controls.Generators
                 Index = new TreeContainerIndex();
                 _treeView = treeViewOwner;
             }
-            else if (Owner.IsAttachedToLogicalTree)
+            else
             {
                 var treeView = Owner.GetSelfAndLogicalAncestors().OfType<TreeView>().FirstOrDefault();
                 
@@ -138,12 +138,6 @@ namespace Avalonia.Controls.Generators
                     _treeView = treeView;
                 }
             }
-            else
-            {
-                Clear();
-                Index = null;
-                _treeView = null;
-            }
         }
 
         class WrapperTreeDataTemplate : ITreeDataTemplate