diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeEntityState.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeEntityState.java
index bbd5ee7e5..5a013d8dc 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeEntityState.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeEntityState.java
@@ -21,7 +21,6 @@ import org.neo4j.graphdb.NotInTransactionException;
 import org.springframework.dao.InvalidDataAccessResourceUsageException;
 import org.springframework.data.graph.core.NodeBacked;
 import org.springframework.data.graph.neo4j.support.GraphDatabaseContext;
-import org.springframework.data.persistence.StateProvider;
 
 /**
  * @author Michael Hunger
@@ -63,10 +62,7 @@ public class NodeEntityState<ENTITY extends NodeBacked> extends DefaultEntitySta
 
     @Override
     public ENTITY persist() {
-        Node node = StateProvider.retrieveState();
-        if (node != null) {
-            setPersistentState(node);
-        } else {
+        if (getPersistentState() == null) {
             createAndAssignState();
         }
         return entity;
diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/PartialNodeEntityState.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/PartialNodeEntityState.java
index 96a8734d4..86c6491c1 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/PartialNodeEntityState.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/PartialNodeEntityState.java
@@ -26,7 +26,6 @@ import org.springframework.data.graph.annotation.RelatedTo;
 import org.springframework.data.graph.core.NodeBacked;
 import org.springframework.data.graph.neo4j.repository.DirectGraphRepositoryFactory;
 import org.springframework.data.graph.neo4j.support.GraphDatabaseContext;
-import org.springframework.data.persistence.StateProvider;
 
 import javax.persistence.PersistenceUnitUtil;
 import java.lang.reflect.Field;
@@ -132,10 +131,7 @@ public class PartialNodeEntityState<ENTITY extends NodeBacked> extends DefaultEn
 
     @Override
     public ENTITY persist() {
-        Node node = StateProvider.retrieveState();
-        if (node != null) {
-            setPersistentState(node);
-        } else {
+        if (getPersistentState() == null) {
             createAndAssignState();
         }
         return entity;