diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/repository/config/RepositoryBeanDefinitionBuilder.java b/spring-data-commons-core/src/main/java/org/springframework/data/repository/config/RepositoryBeanDefinitionBuilder.java
index f3d576e8a..2f00516d2 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/repository/config/RepositoryBeanDefinitionBuilder.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/repository/config/RepositoryBeanDefinitionBuilder.java
@@ -97,6 +97,7 @@ public class RepositoryBeanDefinitionBuilder {
 
 		if (customImplementationBeanName != null) {
 			builder.addPropertyReference("customImplementation", customImplementationBeanName);
+			builder.addDependsOn(customImplementationBeanName);
 		}
 
 		return builder;