diff --git a/src/Avalonia.Base/Data/Core/SettableNode.cs b/src/Avalonia.Base/Data/Core/SettableNode.cs
index 1f6ec0bff4..092cdbe48f 100644
--- a/src/Avalonia.Base/Data/Core/SettableNode.cs
+++ b/src/Avalonia.Base/Data/Core/SettableNode.cs
@@ -26,7 +26,7 @@ namespace Avalonia.Data.Core
             }
             if (PropertyType.IsValueType)
             {
-                return LastValue?.Target.Equals(value) ?? false;
+                return LastValue?.Target != null && LastValue.Target.Equals(value);
             }
             return LastValue != null && Object.ReferenceEquals(LastValue?.Target, value);
         }