diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/RelationshipCursor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/RelationshipCursor.java
index 6e48c2ad68719..41929df4feb52 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/RelationshipCursor.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/RelationshipCursor.java
@@ -28,7 +28,8 @@
 abstract class RelationshipCursor extends RelationshipRecord implements RelationshipDataAccessor, RelationshipVisitor<RuntimeException>
 {
     Read read;
-    private HasChanges hasChanges = HasChanges.MAYBE;
+    private boolean hasChanges;
+    private boolean checkHasChanges;
 
     RelationshipCursor()
     {
@@ -38,7 +39,7 @@ abstract class RelationshipCursor extends RelationshipRecord implements Relation
     protected void init( Read read )
     {
         this.read = read;
-        this.hasChanges = HasChanges.MAYBE;
+        this.checkHasChanges = true;
     }
 
     @Override
@@ -103,22 +104,17 @@ public long propertiesReference()
      */
     protected boolean hasChanges()
     {
-        if ( hasChanges == HasChanges.MAYBE )
+        if ( checkHasChanges )
         {
-            boolean changes = read.hasTxStateWithChanges();
-            if ( changes )
+            hasChanges = read.hasTxStateWithChanges();
+            if ( hasChanges )
             {
                 collectAddedTxStateSnapshot();
-                hasChanges = HasChanges.YES;
             }
-            else
-            {
-                hasChanges = HasChanges.NO;
-            }
-            return changes;
+            checkHasChanges = false;
         }
 
-        return hasChanges == HasChanges.YES;
+        return hasChanges;
     }
 
     // Load transaction state using RelationshipVisitor