diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java b/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java
index 88b07dff82..30e5f18d56 100644
--- a/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java
+++ b/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java
@@ -201,7 +201,7 @@ public class EntityMetamodel implements Serializable {
 						sessionFactory,
 						i,
 						prop,
-						instrumentationMetadata.isInstrumented()
+						instrumentationMetadata.isInstrumented() || lazyLoadingBytecodeEnhanced
 				);
 			}
 			else {
@@ -210,7 +210,7 @@ public class EntityMetamodel implements Serializable {
 						sessionFactory,
 						i,
 						prop,
-						instrumentationMetadata.isInstrumented()
+						instrumentationMetadata.isInstrumented() || lazyLoadingBytecodeEnhanced
 				);
 			}