diff --git a/src/main/java/org/springframework/data/neo4j/repository/query/QueryFragmentsAndParameters.java b/src/main/java/org/springframework/data/neo4j/repository/query/QueryFragmentsAndParameters.java
index 09bdf1735..2c5a358a6 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/query/QueryFragmentsAndParameters.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/query/QueryFragmentsAndParameters.java
@@ -367,10 +367,14 @@ public final class QueryFragmentsAndParameters {
 			Pageable pageable,
 			QueryFragments queryFragments
 	) {
+		if (pageable.isPaged()) {
+			queryFragments.setSkip(pageable.getOffset());
+			queryFragments.setLimit(pageable.getPageSize());
+		}
 		Sort pageableSort = pageable.getSort();
-		queryFragments.setSkip(pageable.getOffset());
-		queryFragments.setLimit(pageable.getPageSize());
-		queryFragments.setOrderBy(CypherAdapterUtils.toSortItems(entityMetaData, pageableSort));
+		if (pageableSort.isSorted()) {
+			queryFragments.setOrderBy(CypherAdapterUtils.toSortItems(entityMetaData, pageableSort));
+		}
 	}
 
 }