diff --git a/hibernate-core/src/main/java/org/hibernate/hql/spi/id/IdTableHelper.java b/hibernate-core/src/main/java/org/hibernate/hql/spi/id/IdTableHelper.java
index 2bf7478bf9..e0299a5baa 100644
--- a/hibernate-core/src/main/java/org/hibernate/hql/spi/id/IdTableHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/hql/spi/id/IdTableHelper.java
@@ -61,6 +61,9 @@ public class IdTableHelper {
 			List<String> creationStatements,
 			JdbcServices jdbcServices,
 			JdbcConnectionAccess connectionAccess) {
+		if ( creationStatements == null || creationStatements.isEmpty() ) {
+			return;
+		}
 		try {
 			Connection connection;
 			try {