diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DetachedEntityState.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DetachedEntityState.java
index 2e95174ab..17713f5cc 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DetachedEntityState.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DetachedEntityState.java
@@ -137,7 +137,11 @@ public class DetachedEntityState<STATE> implements EntityState<STATE> {
     }
     @Override
     public Object setValue(final Field field, final Object newVal, MappingPolicy mappingPolicy) {
-        return setValue(property(field),newVal, mappingPolicy);
+        Neo4jPersistentProperty property = property(field);
+        if (property != null) {
+            return setValue(property, newVal, mappingPolicy);
+        }
+        return delegate.setValue(property, newVal, mappingPolicy);
     }
 
     private Neo4jPersistentProperty property(Field field) {