diff --git a/src/linkahead/common/models.py b/src/linkahead/common/models.py
index 16243a068b23308b4101e58baa96fa0dcd0a4871..bfaf8f838c366c67d51a0354c29451b7c829eda7 100644
--- a/src/linkahead/common/models.py
+++ b/src/linkahead/common/models.py
@@ -558,24 +558,22 @@ class Entity:
 
         """
 
-        prop = self.get_property(property_name)
-        if prop is None:
+        property = self.get_property(property_name)
+        if property is None:
             return self
-
-        property_value = prop.value
-
-        if property_value is None:
+        
+        if property.value is None:
             remove_if_empty_afterwards = False
 
         empty_afterwards = False
-        if isinstance(property_value, list):
-            if value in property_value:
-                property_value.remove(value)
-                if property_value == []:
-                    property_value = None
+        if isinstance(property.value, list):
+            if value in property.value:
+                property.value.remove(value)
+                if property.value == []:
+                    property.value = None
                     empty_afterwards = True
-        elif property_value == value:
-            property_value = None
+        elif property.value == value:
+            property.value = None
             empty_afterwards = True
 
         if remove_if_empty_afterwards and empty_afterwards: