diff --git a/src/Avalonia.Base/PropertyStore/ValueStore.cs b/src/Avalonia.Base/PropertyStore/ValueStore.cs
index 03d7efc566..8b702665f8 100644
--- a/src/Avalonia.Base/PropertyStore/ValueStore.cs
+++ b/src/Avalonia.Base/PropertyStore/ValueStore.cs
@@ -211,7 +211,7 @@ namespace Avalonia.PropertyStore
 
         public void SetCurrentValue<T>(StyledProperty<T> property, T value)
         {
-            if (_effectiveValues.TryGetValue(property, out var v))
+            if (TryGetEffectiveValue(property, out var v))
             {
                 ((EffectiveValue<T>)v).SetCurrentValueAndRaise(this, property, value);
             }