diff --git a/src/main/java/org/springframework/data/jpa/provider/HibernateJpaParametersParameterAccessor.java b/src/main/java/org/springframework/data/jpa/provider/HibernateJpaParametersParameterAccessor.java
index ddabc9c90..ae06ff25a 100644
--- a/src/main/java/org/springframework/data/jpa/provider/HibernateJpaParametersParameterAccessor.java
+++ b/src/main/java/org/springframework/data/jpa/provider/HibernateJpaParametersParameterAccessor.java
@@ -25,6 +25,7 @@ import org.springframework.data.jpa.repository.query.JpaParametersParameterAcces
 import org.springframework.data.repository.query.Parameter;
 import org.springframework.data.repository.query.Parameters;
 import org.springframework.data.repository.query.ParametersParameterAccessor;
+import org.springframework.lang.Nullable;
 
 /**
  * {@link org.springframework.data.repository.query.ParameterAccessor} based on an {@link Parameters} instance. In
@@ -73,10 +74,11 @@ class HibernateJpaParametersParameterAccessor extends JpaParametersParameterAcce
 	 * Utility method to potentially unwrap {@link TypedParameterValue}s. For certain operations, Hibernate doesn't
 	 * properly support them, so we must unwrap them before passing through.
 	 *
-	 * @param extractedValue
+	 * @param extractedValue the unwrapped value of the original value if there is nothing to unwrap.
 	 * @return the value behind a {@link TypedParameterValue}
 	 */
 	@Override
+	@Nullable
 	public Object potentiallyUnwrap(Object extractedValue) {
 
 		if (extractedValue instanceof TypedParameterValue) {
diff --git a/src/main/java/org/springframework/data/jpa/repository/query/JpaParametersParameterAccessor.java b/src/main/java/org/springframework/data/jpa/repository/query/JpaParametersParameterAccessor.java
index 64d925395..8f67d37da 100644
--- a/src/main/java/org/springframework/data/jpa/repository/query/JpaParametersParameterAccessor.java
+++ b/src/main/java/org/springframework/data/jpa/repository/query/JpaParametersParameterAccessor.java
@@ -48,7 +48,7 @@ public class JpaParametersParameterAccessor extends ParametersParameterAccessor
 	/**
 	 * Utility method to potentially unwrap certain provider-specific types. For general JPA, there are none, so it's a pass-through.
 	 *
-	 * @param extractedValue
+	 * @param extractedValue the unwrapped value or the input value if there is nothing to unwrap.
 	 * @return the same value passed in
 	 */
 	@Nullable