diff --git a/src/Avalonia.Layout/LayoutManager.cs b/src/Avalonia.Layout/LayoutManager.cs
index ebf6411beb..ed2b930114 100644
--- a/src/Avalonia.Layout/LayoutManager.cs
+++ b/src/Avalonia.Layout/LayoutManager.cs
@@ -133,7 +133,7 @@ namespace Avalonia.Layout
 
             if (!control.IsMeasureValid)
             {
-                control.Measure(control.PreviousMeasure.Value);
+                control.Measure(control.PreviousMeasure ?? default(Size));
             }
 
             _toMeasure.Remove(control);