diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd5d6aab6644..6b31ee021aaa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,7 +24,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - Added `CHANGELOG.md` ([#4581](https://github.com/pyg-team/pytorch_geometric/pull/4581))
 ### Changed
 - Math support in Markdown ([#4683](https://github.com/pyg-team/pytorch_geometric/pull/4683))
-- Allow for `setter` properties in `Data` and `HeteroData` ([#4682](https://github.com/pyg-team/pytorch_geometric/pull/4682))
+- Allow for `setter` properties in `Data` ([#4682](https://github.com/pyg-team/pytorch_geometric/pull/4682), [#4686](https://github.com/pyg-team/pytorch_geometric/pull/4686))
 - Allow for optional `edge_weight` in `GCN2Conv` ([#4670](https://github.com/pyg-team/pytorch_geometric/pull/4670))
 - Fixed the interplay between `TUDataset` and `pre_transform` that modify node features ([#4669](https://github.com/pyg-team/pytorch_geometric/pull/4669))
 - Make use of the `pyg_sphinx_theme` documentation template ([#4664](https://github.com/pyg-team/pyg-lib/pull/4664), [#4667](https://github.com/pyg-team/pyg-lib/pull/4667))
diff --git a/torch_geometric/data/data.py b/torch_geometric/data/data.py
index a6bc90710d89..580c9bdd3b6e 100644
--- a/torch_geometric/data/data.py
+++ b/torch_geometric/data/data.py
@@ -376,10 +376,10 @@ def __getattr__(self, key: str) -> Any:
 
     def __setattr__(self, key: str, value: Any):
         propobj = getattr(self.__class__, key, None)
-        if propobj is None or propobj.fset is None:
-            setattr(self._store, key, value)
-        else:
+        if propobj is not None and getattr(propobj, 'fset', None) is not None:
             propobj.fset(self, value)
+        else:
+            setattr(self._store, key, value)
 
     def __delattr__(self, key: str):
         delattr(self._store, key)