diff --git a/annotations/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationActivator.java b/annotations/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationActivator.java
index bcc08753e2..bbd2d142b5 100644
--- a/annotations/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationActivator.java
+++ b/annotations/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationActivator.java
@@ -50,7 +50,7 @@ public class BeanValidationActivator {
 			properties.setProperty( Environment.CHECK_NULLABILITY, "false" );
 		}
 
-		if ( modes.contains( ValidationMode.NONE ) ) return;
+		if ( ! ( modes.contains( ValidationMode.CALLBACK ) || modes.contains( ValidationMode.AUTO ) ) ) return;
 
 		try {
 			Class<?> activator = ReflectHelper.classForName( TYPE_SAFE_ACTIVATOR_CLASS, BeanValidationActivator.class );