diff --git a/src/Avalonia.Base/AvaloniaObject.cs b/src/Avalonia.Base/AvaloniaObject.cs
index e0fa93c341..023594de9a 100644
--- a/src/Avalonia.Base/AvaloniaObject.cs
+++ b/src/Avalonia.Base/AvaloniaObject.cs
@@ -431,7 +431,7 @@ namespace Avalonia
             Optional<T> oldValue,
             Optional<T> newValue)
         {
-            if (property.Inherits && !IsSet(property))
+            if (property.Inherits && (_values == null || !_values.IsSet(property)))
             {
                 RaisePropertyChanged(property, oldValue, newValue, BindingPriority.LocalValue);
             }