diff --git a/src/main/java/org/springframework/data/repository/core/support/RepositoryFactorySupport.java b/src/main/java/org/springframework/data/repository/core/support/RepositoryFactorySupport.java
index 92ad9d2b6..eff6a0530 100644
--- a/src/main/java/org/springframework/data/repository/core/support/RepositoryFactorySupport.java
+++ b/src/main/java/org/springframework/data/repository/core/support/RepositoryFactorySupport.java
@@ -84,8 +84,8 @@ public abstract class RepositoryFactorySupport implements BeanClassLoaderAware {
 	private ClassLoader classLoader = org.springframework.util.ClassUtils.getDefaultClassLoader();
 	private EvaluationContextProvider evaluationContextProvider = DefaultEvaluationContextProvider.INSTANCE;
 
-	private QueryCollectingQueryCreationListener collectingListener = new QueryCollectingQueryCreationListener();
 	private QueryAugmentationEngine augmentationEngine = QueryAugmentationEngine.NONE;
+	private QueryCollectingQueryCreationListener collectingListener = new QueryCollectingQueryCreationListener();
 
 	public RepositoryFactorySupport() {
 		this.queryPostProcessors.add(collectingListener);
@@ -441,6 +441,11 @@ public abstract class RepositoryFactorySupport implements BeanClassLoaderAware {
 
 			for (Method method : queryMethods) {
 				RepositoryQuery query = lookupStrategy.resolveQuery(method, repositoryInformation, namedQueries);
+
+				if (query instanceof QueryAugmentationEngineAware) {
+					((QueryAugmentationEngineAware) query).setQueryAugmentationEngine(augmentationEngine);
+				}
+
 				invokeListeners(query);
 				queries.put(method, query);
 			}