diff --git a/src/Avalonia.Base/Data/BindingValue.cs b/src/Avalonia.Base/Data/BindingValue.cs
index 0e7bdfe0bf..e8c84ffb21 100644
--- a/src/Avalonia.Base/Data/BindingValue.cs
+++ b/src/Avalonia.Base/Data/BindingValue.cs
@@ -247,7 +247,7 @@ namespace Avalonia.Data
                 UnsetValueType _ => Unset,
                 DoNothingType _ => DoNothing,
                 BindingNotification n => n.ToBindingValue().Cast<T>(),
-                _ => new BindingValue<T>((T)value!)
+                _ => new BindingValue<T>((T?)value)
             };
         }
 
diff --git a/src/Avalonia.Base/PropertyStore/ConstantValueEntry.cs b/src/Avalonia.Base/PropertyStore/ConstantValueEntry.cs
index ebcd064626..dc4a1d88c1 100644
--- a/src/Avalonia.Base/PropertyStore/ConstantValueEntry.cs
+++ b/src/Avalonia.Base/PropertyStore/ConstantValueEntry.cs
@@ -30,7 +30,7 @@ namespace Avalonia.PropertyStore
             IValueSink sink)
         {
             Property = property;
-            _value = value!;
+            _value = value;
             Priority = priority;
             _sink = sink;
         }
diff --git a/src/Avalonia.Base/ValueStore.cs b/src/Avalonia.Base/ValueStore.cs
index 151e5d1949..495f13e1a9 100644
--- a/src/Avalonia.Base/ValueStore.cs
+++ b/src/Avalonia.Base/ValueStore.cs
@@ -192,7 +192,7 @@ namespace Avalonia
                         _values.SetValue(property, sentinel);
                     }
 
-                    NotifyValueChanged<T>(property, old!, default!, BindingPriority.Unset);
+                    NotifyValueChanged<T>(property, old, default, BindingPriority.Unset);
                 }
             }
         }