diff --git a/src/Avalonia.Controls/ItemsControl.cs b/src/Avalonia.Controls/ItemsControl.cs
index 67f726d056..5d12c9963f 100644
--- a/src/Avalonia.Controls/ItemsControl.cs
+++ b/src/Avalonia.Controls/ItemsControl.cs
@@ -242,7 +242,10 @@ namespace Avalonia.Controls
 
                             containerControl.UpdateChild();
 
-                            LogicalChildren.Add(containerControl.Child);
+                            if (containerControl.Child != null)
+                            {
+                                LogicalChildren.Add(containerControl.Child);
+                            }
                         }
                     }
                     else
@@ -273,7 +276,11 @@ namespace Avalonia.Controls
                         if (containerControl != null)
                         {
                             ((ISetLogicalParent)containerControl).SetParent(null);
-                            LogicalChildren.Remove(containerControl.Child);
+
+                            if (containerControl.Child != null)
+                            {
+                                LogicalChildren.Remove(containerControl.Child);
+                            }
                         }
                     }
                     else