diff --git a/src/Avalonia.Base/PropertyStore/ValueStore.cs b/src/Avalonia.Base/PropertyStore/ValueStore.cs
index 4da24c1414..8d7fae41bf 100644
--- a/src/Avalonia.Base/PropertyStore/ValueStore.cs
+++ b/src/Avalonia.Base/PropertyStore/ValueStore.cs
@@ -899,6 +899,9 @@ namespace Avalonia.PropertyStore
                     {
                         RemoveEffectiveValue(key, i);
                         e.DisposeAndRaiseUnset(this, key);
+
+                        if (i > _effectiveValues.Count)
+                            break;
                     }
                 }
             }