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 a5eb2b8001..62466bad63 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
@@ -205,7 +205,6 @@ public class InformationExtractorJdbcDatabaseMetaDataImpl implements Information
 				isPhysicalTableType( resultSet.getString( "TABLE_TYPE" ) ),
 				resultSet.getString( "REMARKS" )
 		);
-		addColumns( tableInformation );
 		return tableInformation;
 	}
 
@@ -495,6 +494,7 @@ public class InformationExtractorJdbcDatabaseMetaDataImpl implements Information
 					else {
 						found = true;
 						tableInformation = extractTableInformation( resultSet );
+						addColumns( tableInformation );
 					}
 				}
 			}