diff --git a/Ragon.Client/Sources/Entity/RagonProperty.cs b/Ragon.Client/Sources/Entity/RagonProperty.cs
index 6c55d7a..e017711 100644
--- a/Ragon.Client/Sources/Entity/RagonProperty.cs
+++ b/Ragon.Client/Sources/Entity/RagonProperty.cs
@@ -70,10 +70,14 @@ namespace Ragon.Client
     {
       InvokeChanged();
       
-      if (_dirty) return;
-      _dirty = true;
+      if (_dirty) 
+        return;
 
-      _entity?.TrackChangedProperty(this);
+      if (_entity != null)
+      {
+        _dirty = true;
+        _entity.TrackChangedProperty(this);
+      }
     }
 
     internal void Flush()