diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/InformationExtractorJdbcDatabaseMetaDataImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/InformationExtractorJdbcDatabaseMetaDataImpl.java
index 36c8e666ed..1eaa70e2bd 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/InformationExtractorJdbcDatabaseMetaDataImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/InformationExtractorJdbcDatabaseMetaDataImpl.java
@@ -251,8 +251,8 @@ public class InformationExtractorJdbcDatabaseMetaDataImpl implements Information
 			// 2) look in default namespace
 			if ( extractionContext.getDefaultCatalog() != null || extractionContext.getDefaultSchema() != null ) {
 				tableInfo = locateTableInNamespace(
-						extractionContext.getJdbcEnvironment().getCurrentCatalog(),
-						extractionContext.getJdbcEnvironment().getCurrentSchema(),
+						extractionContext.getDefaultCatalog(),
+						extractionContext.getDefaultSchema(),
 						tableName
 				);