diff --git a/src/Perspex.Controls/Generators/ItemContainerGenerator.cs b/src/Perspex.Controls/Generators/ItemContainerGenerator.cs
index f1f49affbf..0e30518346 100644
--- a/src/Perspex.Controls/Generators/ItemContainerGenerator.cs
+++ b/src/Perspex.Controls/Generators/ItemContainerGenerator.cs
@@ -103,7 +103,7 @@ namespace Perspex.Controls.Generators
         /// <inheritdoc/>
         public virtual IEnumerable<ItemContainer> Clear()
         {
-            var result = _containers;
+            var result = _containers.Where(x => x != null).ToList();
             _containers = new List<ItemContainer>();
 
             if (result.Count > 0)