diff --git a/src/Avalonia.Controls/Shapes/Polygon.cs b/src/Avalonia.Controls/Shapes/Polygon.cs
index 3ac5af2d33..1a9dc42490 100644
--- a/src/Avalonia.Controls/Shapes/Polygon.cs
+++ b/src/Avalonia.Controls/Shapes/Polygon.cs
@@ -4,15 +4,15 @@ namespace Avalonia.Controls.Shapes
 {
     public class Polygon : Shape
     {
-        public static readonly StyledProperty<Points> PointsProperty =
-            AvaloniaProperty.Register<Polygon, Points>("Points");
+        public static readonly StyledProperty<Points?> PointsProperty =
+            AvaloniaProperty.Register<Polygon, Points?>("Points");
 
         static Polygon()
         {
             AffectsGeometry<Polygon>(PointsProperty);
         }
 
-        public Points Points
+        public Points? Points
         {
             get { return GetValue(PointsProperty); }
             set { SetValue(PointsProperty, value); }
diff --git a/src/Avalonia.Controls/Shapes/Polyline.cs b/src/Avalonia.Controls/Shapes/Polyline.cs
index e6edd7a599..95ab880142 100644
--- a/src/Avalonia.Controls/Shapes/Polyline.cs
+++ b/src/Avalonia.Controls/Shapes/Polyline.cs
@@ -5,8 +5,8 @@ namespace Avalonia.Controls.Shapes
 {
     public class Polyline: Shape
     {
-        public static readonly StyledProperty<Points> PointsProperty =
-            AvaloniaProperty.Register<Polyline, Points>("Points");
+        public static readonly StyledProperty<Points?> PointsProperty =
+            AvaloniaProperty.Register<Polyline, Points?>("Points");
 
         static Polyline()
         {
@@ -14,7 +14,7 @@ namespace Avalonia.Controls.Shapes
             AffectsGeometry<Polyline>(PointsProperty);
         }
 
-        public Points Points
+        public Points? Points
         {
             get { return GetValue(PointsProperty); }
             set { SetValue(PointsProperty, value); }