diff --git a/src/Avalonia.Layout/LayoutManager.cs b/src/Avalonia.Layout/LayoutManager.cs
index f1f0749d41..73aadcd545 100644
--- a/src/Avalonia.Layout/LayoutManager.cs
+++ b/src/Avalonia.Layout/LayoutManager.cs
@@ -165,7 +165,7 @@ namespace Avalonia.Layout
                 {
                     root.Measure(Size.Infinity);
                 }
-                else
+                else if (control.PreviousMeasure.HasValue)
                 {
                     control.Measure(control.PreviousMeasure.Value);
                 }
@@ -185,7 +185,7 @@ namespace Avalonia.Layout
                 {
                     root.Arrange(new Rect(control.DesiredSize));
                 }
-                else
+                else if (control.PreviousArrange.HasValue)
                 {
                     control.Arrange(control.PreviousArrange.Value);
                 }