diff --git a/src/Avalonia.Controls/LayoutTransformControl.cs b/src/Avalonia.Controls/LayoutTransformControl.cs
index 3616e7b574..950d4f34da 100644
--- a/src/Avalonia.Controls/LayoutTransformControl.cs
+++ b/src/Avalonia.Controls/LayoutTransformControl.cs
@@ -22,7 +22,7 @@ namespace Avalonia.Controls
 
         static LayoutTransformControl()
         {
-            ClipToBoundsProperty.OverrideDefaultValue<Viewbox>(true);
+            ClipToBoundsProperty.OverrideDefaultValue<LayoutTransformControl>(true);
 
             LayoutTransformProperty.Changed
                 .AddClassHandler<LayoutTransformControl>(x => x.OnLayoutTransformChanged);
diff --git a/src/Avalonia.Controls/Viewbox.cs b/src/Avalonia.Controls/Viewbox.cs
index 94d72f3e6c..db753f4ab4 100644
--- a/src/Avalonia.Controls/Viewbox.cs
+++ b/src/Avalonia.Controls/Viewbox.cs
@@ -33,8 +33,8 @@ namespace Avalonia.Controls
 
         static Viewbox()
         {
-            AffectsMeasure<Viewbox>(StretchProperty);
             ClipToBoundsProperty.OverrideDefaultValue<Viewbox>(true);
+            AffectsMeasure<Viewbox>(StretchProperty);
         }
 
         protected override Size MeasureOverride(Size availableSize)