diff --git a/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/MapKeyEntityFromElement.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/MapKeyEntityFromElement.java
index bc8650cf8f..d6624c25c8 100644
--- a/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/MapKeyEntityFromElement.java
+++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/MapKeyEntityFromElement.java
@@ -83,7 +83,8 @@ public class MapKeyEntityFromElement extends FromElement {
 				// todo : ever a time when INNER is appropriate?
 				//JoinType.LEFT_OUTER_JOIN,
 				// needs to be an inner join because of how JoinSequence/JoinFragment work - ugh
-				JoinType.INNER_JOIN,
+//				JoinType.INNER_JOIN,
+				collectionFromElement.getJoinSequence().getFirstJoin().getJoinType(),
 				joinColumns
 		);
 		join.setJoinSequence( joinSequence );