diff --git a/src/main/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfiguration.java b/src/main/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfiguration.java
index 2ad56e78..44153367 100644
--- a/src/main/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfiguration.java
+++ b/src/main/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfiguration.java
@@ -86,8 +86,8 @@ public abstract class AbstractCouchbaseConfiguration implements CouchbaseConfigu
 	}
 
 	@Bean
-	public CouchbaseClientFactory couchbaseClientFactory(Cluster couchbaseCluster) {
-		return new SimpleCouchbaseClientFactory(couchbaseCluster, getBucketName(), getScopeName());
+	public CouchbaseClientFactory couchbaseClientFactory() throws Exception {
+		return new SimpleCouchbaseClientFactory(couchbaseConfigurer().couchbaseCluster(), getBucketName(), getScopeName());
 	}
 
 	@Override