diff --git a/src/main/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryBean.java b/src/main/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryBean.java
index 12342531e..e5f7695f2 100644
--- a/src/main/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryBean.java
+++ b/src/main/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryBean.java
@@ -25,6 +25,7 @@ import javax.persistence.EntityManager;
 
 import org.springframework.data.jpa.repository.support.JpaRepositoryFactory;
 import org.springframework.data.repository.cdi.CdiRepositoryBean;
+import org.springframework.data.repository.config.CustomRepositoryImplementationDetector;
 import org.springframework.util.Assert;
 
 /**
@@ -46,12 +47,12 @@ class JpaRepositoryBean<T> extends CdiRepositoryBean<T> {
 	 * @param entityManagerBean must not be {@literal null}.
 	 * @param qualifiers must not be {@literal null}.
 	 * @param repositoryType must not be {@literal null}.
-	 * @param customImplementationBean can be {@literal null}.
+	 * @param detector can be {@literal null}.
 	 */
 	JpaRepositoryBean(BeanManager beanManager, Bean<EntityManager> entityManagerBean, Set<Annotation> qualifiers,
-			Class<T> repositoryType, Bean<?> customImplementationBean) {
+			Class<T> repositoryType, CustomRepositoryImplementationDetector detector) {
 
-		super(qualifiers, repositoryType, beanManager, customImplementationBean);
+		super(qualifiers, repositoryType, beanManager, detector);
 
 		Assert.notNull(entityManagerBean);
 		this.entityManagerBean = entityManagerBean;
diff --git a/src/main/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryExtension.java b/src/main/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryExtension.java
index 9360fbe13..eb1a60f52 100644
--- a/src/main/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryExtension.java
+++ b/src/main/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryExtension.java
@@ -119,10 +119,8 @@ public class JpaRepositoryExtension extends CdiRepositoryExtensionSupport {
 					EntityManager.class.getName(), qualifiers));
 		}
 
-		Bean<?> customImplementationBean = getCustomImplementationBean(repositoryType, beanManager, qualifiers);
-
 		// Construct and return the repository bean.
 		return new JpaRepositoryBean<T>(beanManager, entityManagerBean, qualifiers, repositoryType,
-				customImplementationBean);
+				getCustomImplementationDetector());
 	}
 }