diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/ParameterMetadataProvider.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/ParameterMetadataProvider.java
index 9eeb694a6..e214ffe4c 100644
--- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/ParameterMetadataProvider.java
+++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/ParameterMetadataProvider.java
@@ -237,6 +237,10 @@ class ParameterMetadataProvider {
 
 			Class<? extends T> expressionType = expression.getJavaType();
 
+			if (expressionType == null) {
+				return value;
+			}
+
 			if (String.class.equals(expressionType)) {
 
 				switch (type) {