diff --git a/src/main/java/org/springframework/data/jpa/repository/query/PartTreeJpaQuery.java b/src/main/java/org/springframework/data/jpa/repository/query/PartTreeJpaQuery.java
index d199bef94..3ddb0b9fc 100644
--- a/src/main/java/org/springframework/data/jpa/repository/query/PartTreeJpaQuery.java
+++ b/src/main/java/org/springframework/data/jpa/repository/query/PartTreeJpaQuery.java
@@ -238,8 +238,9 @@ public class PartTreeJpaQuery extends AbstractJpaQuery {
 
 		private Sort getDynamicSort(Object[] values) {
 
-			return parameters.potentiallySortsDynamically() ? new ParametersParameterAccessor(parameters, values).getSort()
-					: null;
+			return parameters.potentiallySortsDynamically() //
+					? new ParametersParameterAccessor(parameters, values).getSort() //
+					: Sort.unsorted();
 		}
 	}