diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/HqlCountQueryTransformer.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/HqlCountQueryTransformer.java
index b6a90c559..579d89067 100644
--- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/HqlCountQueryTransformer.java
+++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/HqlCountQueryTransformer.java
@@ -168,6 +168,7 @@ class HqlCountQueryTransformer extends HqlQueryRenderer {
 
 		QueryRendererBuilder builder = QueryRenderer.builder();
 
+		builder.append(TOKEN_SPACE);
 		builder.appendExpression(visit(ctx.joinType()));
 		builder.append(QueryTokens.expression(ctx.JOIN()));
 
diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/HqlQueryRenderer.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/HqlQueryRenderer.java
index 2a423e583..1656d3708 100644
--- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/HqlQueryRenderer.java
+++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/HqlQueryRenderer.java
@@ -329,8 +329,8 @@ class HqlQueryRenderer extends HqlBaseVisitor<QueryTokenStream> {
 
 		QueryRendererBuilder builder = QueryRenderer.builder();
 
-		builder.appendExpression(visit(ctx.fromRoot()));
-		builder.appendInline(QueryTokenStream.concat(ctx.joinSpecifier(), this::visit, TOKEN_SPACE));
+		builder.appendInline(visit(ctx.fromRoot()));
+		builder.appendInline(QueryTokenStream.concat(ctx.joinSpecifier(), this::visit, EMPTY_TOKEN));
 
 		return builder;
 	}
@@ -389,6 +389,7 @@ class HqlQueryRenderer extends HqlBaseVisitor<QueryTokenStream> {
 
 		QueryRendererBuilder builder = QueryRenderer.builder();
 
+		builder.append(TOKEN_SPACE);
 		builder.append(visit(ctx.joinType()));
 		builder.append(QueryTokens.expression(ctx.JOIN()));
 
@@ -746,7 +747,7 @@ class HqlQueryRenderer extends HqlBaseVisitor<QueryTokenStream> {
 		QueryRendererBuilder builder = QueryRenderer.builder();
 
 		builder.append(QueryTokens.expression(ctx.OFFSET()));
-		builder.append(visit(ctx.parameterOrIntegerLiteral()));
+		builder.appendExpression(visit(ctx.parameterOrIntegerLiteral()));
 
 		if (ctx.ROW() != null) {
 			builder.append(QueryTokens.expression(ctx.ROW()));
@@ -3377,7 +3378,7 @@ class HqlQueryRenderer extends HqlBaseVisitor<QueryTokenStream> {
 			builder.append(TOKEN_CLOSE_PAREN);
 		} else {
 
-			builder.appendExpression(visit(ctx.collectionQuantifier()));
+			builder.append(visit(ctx.collectionQuantifier()));
 
 			builder.append(TOKEN_OPEN_PAREN);
 			builder.appendInline(visit(ctx.simplePath()));
@@ -3412,7 +3413,7 @@ class HqlQueryRenderer extends HqlBaseVisitor<QueryTokenStream> {
 			builder.append(TOKEN_CLOSE_PAREN);
 		} else {
 
-			builder.appendExpression(visit(ctx.collectionQuantifier()));
+			builder.append(visit(ctx.collectionQuantifier()));
 
 			builder.append(TOKEN_OPEN_PAREN);
 			builder.appendInline(visit(ctx.simplePath()));
@@ -3801,9 +3802,9 @@ class HqlQueryRenderer extends HqlBaseVisitor<QueryTokenStream> {
 		if (ctx.simplePath() != null) {
 
 			if (ctx.ELEMENTS() != null) {
-				builder.append(QueryTokens.expression(ctx.ELEMENTS()));
+				builder.append(QueryTokens.token(ctx.ELEMENTS()));
 			} else if (ctx.INDICES() != null) {
-				builder.append(QueryTokens.expression(ctx.INDICES()));
+				builder.append(QueryTokens.token(ctx.INDICES()));
 			}
 
 			builder.append(TOKEN_OPEN_PAREN);
@@ -3836,9 +3837,9 @@ class HqlQueryRenderer extends HqlBaseVisitor<QueryTokenStream> {
 			builder.append(QueryTokens.expression(ctx.EXISTS()));
 
 			if (ctx.ELEMENTS() != null) {
-				builder.append(QueryTokens.expression(ctx.ELEMENTS()));
+				builder.append(QueryTokens.token(ctx.ELEMENTS()));
 			} else if (ctx.INDICES() != null) {
-				builder.append(QueryTokens.expression(ctx.INDICES()));
+				builder.append(QueryTokens.token(ctx.INDICES()));
 			}
 
 			builder.append(TOKEN_OPEN_PAREN);
diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryTokens.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryTokens.java
index 33ff1bc5e..0a60c39ac 100644
--- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryTokens.java
+++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryTokens.java
@@ -31,6 +31,7 @@ class QueryTokens {
 	/**
 	 * Commonly use tokens.
 	 */
+	static final QueryToken EMPTY_TOKEN = token("");
 	static final QueryToken TOKEN_COMMA = token(", ");
 	static final QueryToken TOKEN_SPACE = token(" ");
 	static final QueryToken TOKEN_DOT = token(".");