diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/hint/IndexQueryHintHandler.java b/hibernate-core/src/main/java/org/hibernate/dialect/hint/IndexQueryHintHandler.java
index 9a70d556786c..e888839f05df 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/hint/IndexQueryHintHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/hint/IndexQueryHintHandler.java
@@ -25,7 +25,7 @@ public class IndexQueryHintHandler implements QueryHintHandler {
 
 	public static final IndexQueryHintHandler INSTANCE = new IndexQueryHintHandler();
 
-	private static final Pattern QUERY_PATTERN = Pattern.compile( "^\\s*(select\\b.+?\\bfrom\\b.+?)(\\bwhere\\b.+?)$" );
+	private static final Pattern QUERY_PATTERN = Pattern.compile( "^\\s*(select\\b.+?\\bfrom\\b.+?)(\\b(where|join)\\b.+?)$" );
 
 	@Override
 	public String addQueryHints(String query, String hints) {