diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/parser/AbstractQueryCreator.java b/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/parser/AbstractQueryCreator.java
index 3ccdf52b1..182811375 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/parser/AbstractQueryCreator.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/parser/AbstractQueryCreator.java
@@ -62,7 +62,10 @@ public abstract class AbstractQueryCreator<T, S> {
      */
     public T createQuery() {
 
-        return complete(createCriteria(tree), tree.getSort());
+        Sort treeSort = tree.getSort();
+        Sort sort = treeSort != null ? treeSort : parameters.getSort();
+
+        return complete(createCriteria(tree), sort);
     }