diff --git a/src/main/java/org/springframework/data/neo4j/core/PreparedQuery.java b/src/main/java/org/springframework/data/neo4j/core/PreparedQuery.java
index 69d82ccbc..52c8ba3d8 100644
--- a/src/main/java/org/springframework/data/neo4j/core/PreparedQuery.java
+++ b/src/main/java/org/springframework/data/neo4j/core/PreparedQuery.java
@@ -186,6 +186,14 @@ public final class PreparedQuery<T> {
 					: value.asList(Value::asPath);
 
 			for (Path path : paths) {
+				if (path.length() == 0) {
+					// should only be exactly one
+					Iterable<Node> pathNodes = path.nodes();
+					for (Node pathNode : pathNodes) {
+						nodes.add(Values.value(pathNode));
+					}
+					continue;
+				}
 				Node lastNode = null;
 				for (Path.Segment segment : path) {
 					Node start = segment.start();