diff --git a/src/Avalonia.Controls/Generators/ItemContainerGenerator`1.cs b/src/Avalonia.Controls/Generators/ItemContainerGenerator`1.cs
index 3a098593dc..d1fbb25cb1 100644
--- a/src/Avalonia.Controls/Generators/ItemContainerGenerator`1.cs
+++ b/src/Avalonia.Controls/Generators/ItemContainerGenerator`1.cs
@@ -47,11 +47,7 @@ namespace Avalonia.Controls.Generators
         {
             var container = item as T;
 
-            if (item == null)
-            {
-                return null;
-            }
-            else if (container != null)
+            if (container != null)
             {
                 return container;
             }
diff --git a/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTests.cs b/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTests.cs
index ff3ad30a88..c5c7737f0d 100644
--- a/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTests.cs
@@ -144,6 +144,16 @@ namespace Avalonia.Controls.UnitTests.Generators
             Assert.Equal("bar", container.Content);
         }
 
+        [Fact]
+        public void Materialize_Should_Create_Containers_When_Item_Is_Null()
+        {
+            var owner = new Decorator();
+            var target = new ItemContainerGenerator<ListBoxItem>(owner, ListBoxItem.ContentProperty, null);
+            var container = (ListBoxItem)target.Materialize(0, null).ContainerControl;
+
+            Assert.True(container != null, "The containers is not materialized.");
+        }
+
         private IList<ItemContainerInfo> Materialize(
             IItemContainerGenerator generator,
             int index,