diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/join/N1qlJoinResolver.java b/src/main/java/org/springframework/data/couchbase/core/convert/join/N1qlJoinResolver.java
index fdecb7af7..35b0a5bf1 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/join/N1qlJoinResolver.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/join/N1qlJoinResolver.java
@@ -49,8 +49,8 @@ public static String buildQuery(CouchbaseTemplate template, N1qlJoinResolverPara
 		}
 		String useLKS = useLKSBuilder.length() > 0 ? "USE " + useLKSBuilder.toString() + " " : "";
 
-		String from = "FROM `" + template.getBucketName() + "` lks " + useLKS + joinType + " " + template.getBucketName()
-				+ " rks";
+		String from = "FROM `" + template.getBucketName() + "` lks " + useLKS + joinType + " `" + template.getBucketName()
+				+ "` rks";
 		String onLks = "lks." + template.getConverter().getTypeKey() + " = \""
 				+ parameters.getEntityTypeInfo().getType().getName() + "\"";
 		String onRks = "rks." + template.getConverter().getTypeKey() + " = \""