diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/HqlQueryTransformer.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/HqlQueryTransformer.java
index dc0445263d..4c7a7e359e 100644
--- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/HqlQueryTransformer.java
+++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/HqlQueryTransformer.java
@@ -101,8 +101,12 @@ private static boolean isSubquery(ParserRuleContext ctx) {
 			return false;
 		} else if (ctx instanceof HqlParser.InsertStatementContext) {
 			return false;
+		} else if (ctx instanceof HqlParser.DeleteStatementContext) {
+			return false;
+		} else if (ctx instanceof HqlParser.UpdateStatementContext) {
+				return false;
 		} else {
-			return isSubquery(ctx.getParent());
+			return ctx.getParent() != null ? isSubquery(ctx.getParent()) : false;
 		}
 	}
 
diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/HqlQueryTransformerTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/HqlQueryTransformerTests.java
index 648c03e055..5dab8c1cfe 100644
--- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/HqlQueryTransformerTests.java
+++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/HqlQueryTransformerTests.java
@@ -995,16 +995,23 @@ void fromWithoutAPrimaryAliasShouldWork() {
 				.isEqualTo("FROM Story WHERE enabled = true order by created desc");
 	}
 
-	@Test // GH-2977
-	void isSubqueryThrowsException() {
-
-		String query = """
-				insert into MyEntity (id, col)
-				select max(id), col
-				from MyEntityStaging
-				group by col
-				""";
-
+	@ParameterizedTest
+	@ValueSource(strings = { """
+			insert into MyEntity (id, col)
+			select max(id), col
+			from MyEntityStaging
+			group by col
+			""", """
+			update MyEntity AS mes
+			set mes.col = 'test'
+			where mes.id = 1
+			""", """
+			delete MyEntity AS mes
+			where mes.col = 'test'
+			"""
+
+	}) // GH-2977, GH-3649
+	void isSubqueryThrowsException(String query) {
 		assertThat(createQueryFor(query, Sort.unsorted())).isEqualToIgnoringWhitespace(query);
 	}