diff --git a/src/Orchard/DisplayManagement/Implementation/DefaultShapeFactory.cs b/src/Orchard/DisplayManagement/Implementation/DefaultShapeFactory.cs
index 2f0cec598..562852bea 100644
--- a/src/Orchard/DisplayManagement/Implementation/DefaultShapeFactory.cs
+++ b/src/Orchard/DisplayManagement/Implementation/DefaultShapeFactory.cs
@@ -36,6 +36,8 @@ namespace Orchard.DisplayManagement.Implementation {
             ShapeDescriptor shapeDescriptor;
             defaultShapeTable.Descriptors.TryGetValue(shapeType, out shapeDescriptor);
 
+            parameters = parameters ?? Arguments.Empty();
+
             var creatingContext = new ShapeCreatingContext {
                 New = this,
                 ShapeFactory = this,