diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/NodeBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/NodeBuilder.java
index a550f9d4d7..df16417926 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/NodeBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/NodeBuilder.java
@@ -17,6 +17,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.hibernate.Internal;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.metamodel.model.domain.JpaMetamodel;
 import org.hibernate.query.NullPrecedence;
@@ -86,7 +87,8 @@ public interface NodeBuilder extends HibernateCriteriaBuilder {
 
 	QueryEngine getQueryEngine();
 
-	void setCriteriaValueHandlingMode(ValueHandlingMode criteriaValueHandlingMode);
+	@Internal
+	ValueHandlingMode setCriteriaValueHandlingMode(ValueHandlingMode criteriaValueHandlingMode);
 
 	<R> SqmTuple<R> tuple(
 			Class<R> tupleType,
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AbstractSqmSelectionQuery.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AbstractSqmSelectionQuery.java
index 7d7783cc14..e8f031d39f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AbstractSqmSelectionQuery.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AbstractSqmSelectionQuery.java
@@ -166,8 +166,13 @@ private SqmSelectStatement<KeyedResult<R>> paginateQuery(
 						getSqmSelectStatement().copy( noParamCopyContext() );
 		final NodeBuilder builder = sqm.nodeBuilder();
 		//TODO: find a better way handle parameters
-		builder.setCriteriaValueHandlingMode(ValueHandlingMode.INLINE);
-		return paginate( keyDefinition, keyValues, sqm, builder );
+		final ValueHandlingMode valueHandlingMode = builder.setCriteriaValueHandlingMode(ValueHandlingMode.INLINE);
+		try {
+			return paginate( keyDefinition, keyValues, sqm, builder );
+		}
+		finally {
+			builder.setCriteriaValueHandlingMode( valueHandlingMode );
+		}
 	}
 
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java
index 65d8569f8f..770bcb5ab6 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java
@@ -228,8 +228,11 @@ public SqmCriteriaNodeBuilder(
 		}
 	}
 
-	public void setCriteriaValueHandlingMode(ValueHandlingMode criteriaValueHandlingMode) {
+	@Override
+	public ValueHandlingMode setCriteriaValueHandlingMode(ValueHandlingMode criteriaValueHandlingMode) {
+		ValueHandlingMode current = this.criteriaValueHandlingMode;
 		this.criteriaValueHandlingMode = criteriaValueHandlingMode;
+		return current;
 	}
 
 	@Override