diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
index ed3114038465..4c3d43e49b4d 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
@@ -283,7 +283,7 @@ public abstract class Dialect implements ConversionContext, TypeContributor, Fun
 	private static final Pattern ESCAPE_CLOSING_COMMENT_PATTERN = Pattern.compile( "\\*/" );
 	private static final Pattern ESCAPE_OPENING_COMMENT_PATTERN = Pattern.compile( "/\\*" );
 	private static final Pattern QUERY_PATTERN = Pattern.compile(
-		"^\\s*(select\\b.+?\\bfrom\\b.+?)(\\b(?:natural )?(?:left |right |full )?(?:inner |outer |cross )?join.+?\\b)?(\\bwhere\\b.+?)$");
+		"^\\s*(select\\s+.+?\\s+from\\s+.+?)(\\s+(?:(?:natural)?\\s*(?:left|right|full)?\\s*(?:inner|outer|cross)?\\s*join|straight_join)\\s+.+?)?(\\s+where\\s+.+?)$");
 
 	private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, Dialect.class.getName() );
 
diff --git a/hibernate-core/src/test/java/org/hibernate/dialect/DialectTest.java b/hibernate-core/src/test/java/org/hibernate/dialect/DialectTest.java
index 45f2432b21bc..6b8fa31eb6f2 100644
--- a/hibernate-core/src/test/java/org/hibernate/dialect/DialectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/dialect/DialectTest.java
@@ -24,21 +24,28 @@ static Stream<Arguments> _addQueryHints() {
 
 		final String hints = "MY_INDEX";
 		final String simpleQuery = "select COUNT(*) from TEST t1_0 where column1 = 'value'";
-		builder.add(
-			Arguments.of("Simple query : hint",
-				"select COUNT(*) from TEST t1_0  use index (MY_INDEX) where column1 = 'value'", simpleQuery, hints));
+		builder.add(Arguments.of("Simple query : hint",
+			"select COUNT(*) from TEST t1_0 use index (MY_INDEX)  where column1 = 'value'", simpleQuery, hints));
 		final String joinQueryUsing = "select COUNT(*) from TEST t1_0 join TEST2 t2_0 using(column2) where field = 'value'";
 		builder.add(Arguments.of("Join query with using : hint",
-			"select COUNT(*) from TEST t1_0  use index (MY_INDEX) join TEST2 t2_0 using(column2) where field = 'value'",
+			"select COUNT(*) from TEST t1_0 use index (MY_INDEX)  join TEST2 t2_0 using(column2) where field = 'value'",
 			joinQueryUsing, hints));
 		final String joinQueryOn = "select COUNT(*) from TEST t1_0 join TEST2 t2_0 on t1_0.column2 = t2_0.column2 where field = 'value'";
 		builder.add(Arguments.of("Join query with on : hint",
-			"select COUNT(*) from TEST t1_0  use index (MY_INDEX) join TEST2 t2_0 on t1_0.column2 = t2_0.column2 where field = 'value'",
+			"select COUNT(*) from TEST t1_0 use index (MY_INDEX)  join TEST2 t2_0 on t1_0.column2 = t2_0.column2 where field = 'value'",
 			joinQueryOn, hints));
 		final String leftJoinQuery = "select COUNT(*) from TEST t1_0 left join TEST2 t2_0 on t1_0.column2 = t2_0.column2 and t1_0.column3 = t2_0.column3 where field = 'value'";
 		builder.add(Arguments.of("Left join query with on : hint",
-			"select COUNT(*) from TEST t1_0  use index (MY_INDEX) left join TEST2 t2_0 on t1_0.column2 = t2_0.column2 and t1_0.column3 = t2_0.column3 where field = 'value'",
+			"select COUNT(*) from TEST t1_0 use index (MY_INDEX)  left join TEST2 t2_0 on t1_0.column2 = t2_0.column2 and t1_0.column3 = t2_0.column3 where field = 'value'",
 			leftJoinQuery, hints));
+		final String straightJoinQueryUsing = "select COUNT(*) from TEST t1_0 straight_join TEST2 t2_0 using(column2) where field = 'value'";
+		builder.add(Arguments.of("Straight join query with using : hint",
+			"select COUNT(*) from TEST t1_0 use index (MY_INDEX)  straight_join TEST2 t2_0 using(column2) where field = 'value'",
+			straightJoinQueryUsing, hints));
+		final String straightJoinQueryOn = "select COUNT(*) from TEST t1_0 straight_join TEST2 t2_0 on t1_0.column2 = t2_0.column2 where field = 'value'";
+		builder.add(Arguments.of("Straight join query with on : hint",
+			"select COUNT(*) from TEST t1_0 use index (MY_INDEX)  straight_join TEST2 t2_0 on t1_0.column2 = t2_0.column2 where field = 'value'",
+			straightJoinQueryOn, hints));
 
 		return builder.build();
 	}