diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
index a6ffa95b70..cfb64b4057 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
@@ -282,16 +282,14 @@ public final class SessionFactoryImpl implements SessionFactoryImplementor {
 			identifierGenerators.put( model.getEntityName(), generator );
 		} );
 
-
-		//Named Queries:
-		this.namedQueryRepository = metadata.buildNamedQueryRepository( this );
-
-
 		LOG.debug( "Instantiated session factory" );
 
 		this.metamodel = new MetamodelImpl( this );
 		this.metamodel.initialize( metadata, determineJpaMetaModelPopulationSetting( properties ) );
 
+		//Named Queries:
+		this.namedQueryRepository = metadata.buildNamedQueryRepository( this );
+
 		settings.getMultiTableBulkIdStrategy().prepare(
 				jdbcServices,
 				buildLocalConnectionAccess(),