diff --git a/src/Avalonia.Controls/Primitives/AdornerLayer.cs b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
index 08b795e9a1..d7862881fb 100644
--- a/src/Avalonia.Controls/Primitives/AdornerLayer.cs
+++ b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
@@ -57,11 +57,11 @@ namespace Avalonia.Controls.Primitives
             {
                 var info = (AdornedElementInfo)child.GetValue(s_adornedElementInfoProperty);
 
-                if (info != null)
+                if (info != null && info.Bounds.HasValue)
                 {
-                    child.RenderTransform = new MatrixTransform(info.Bounds.Transform);
+                    child.RenderTransform = new MatrixTransform(info.Bounds.Value.Transform);
                     child.RenderTransformOrigin = new RelativePoint(new Point(0,0), RelativeUnit.Absolute);
-                    child.Arrange(info.Bounds.Bounds);
+                    child.Arrange(info.Bounds.Value.Bounds);
                 }
                 else
                 {
@@ -120,7 +120,7 @@ namespace Avalonia.Controls.Primitives
 
                 info.Subscription = _tracker.Track(adorned).Subscribe(x =>
                 {
-                    info.Bounds = x.Value;
+                    info.Bounds = x;
                     InvalidateArrange();
                 });
             }
@@ -130,7 +130,7 @@ namespace Avalonia.Controls.Primitives
         {
             public IDisposable Subscription { get; set; }
 
-            public TransformedBounds Bounds { get; set; }
+            public TransformedBounds? Bounds { get; set; }
         }
     }
 }