diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/BatchFetchQueue.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/BatchFetchQueue.java
index 0ef06c23e8..a46a6a446b 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/BatchFetchQueue.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/BatchFetchQueue.java
@@ -370,15 +370,16 @@ public class BatchFetchQueue {
 			return;
 		}
 
-		int i = 1;
-		int end = -1;
-		boolean checkForEnd = false;
-
-		final LinkedHashMap<CollectionEntry, PersistentCollection<?>> map = batchLoadableCollections.get( pluralAttributeMapping.getNavigableRole().getFullPath() );
+		final LinkedHashMap<CollectionEntry, PersistentCollection<?>> map =
+				batchLoadableCollections.get( pluralAttributeMapping.getNavigableRole().getFullPath() );
 		if ( map == null ) {
 			return;
 		}
 
+		int i = 1;
+		int end = -1;
+		boolean checkForEnd = false;
+
 		for ( Entry<CollectionEntry, PersistentCollection<?>> me : map.entrySet() ) {
 			final CollectionEntry ce = me.getKey();
 			final PersistentCollection<?> collection = me.getValue();
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionBatchLoaderArrayParam.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionBatchLoaderArrayParam.java
index be411eab22..5c29d56289 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionBatchLoaderArrayParam.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionBatchLoaderArrayParam.java
@@ -7,6 +7,7 @@
 package org.hibernate.loader.ast.internal;
 
 import java.lang.reflect.Array;
+import java.util.Arrays;
 
 import org.hibernate.LockOptions;
 import org.hibernate.collection.spi.PersistentCollection;
@@ -45,7 +46,6 @@ import static org.hibernate.loader.ast.internal.MultiKeyLoadLogging.MULTI_KEY_LO
 public class CollectionBatchLoaderArrayParam
 		extends AbstractCollectionBatchLoader
 		implements CollectionBatchLoader, SqlArrayMultiKeyLoader {
-	private final  Class<?> arrayElementType;
 	private final JdbcMapping arrayJdbcMapping;
 	private final JdbcParameter jdbcParameter;
 	private final SelectStatement sqlSelect;
@@ -67,10 +67,10 @@ public class CollectionBatchLoaderArrayParam
 			);
 		}
 
-		final SimpleForeignKeyDescriptor keyDescriptor = (SimpleForeignKeyDescriptor) getLoadable().getKeyDescriptor();
+		final SimpleForeignKeyDescriptor keyDescriptor = getKeyDescriptor();
 
-		arrayElementType = keyDescriptor.getJavaType().getJavaTypeClass();
-		final Class<?> arrayClass = Array.newInstance( arrayElementType, 0 ).getClass();
+		final Class<?> keyType = keyDescriptor.getJavaType().getJavaTypeClass();
+		final Class<?> arrayClass = Array.newInstance( keyType, 0 ).getClass();
 
 		final BasicType<?> arrayBasicType = getSessionFactory().getTypeConfiguration()
 				.getBasicTypeRegistry()
@@ -101,6 +101,10 @@ public class CollectionBatchLoaderArrayParam
 		singleKeyLoader = new CollectionLoaderSingleKey( attributeMapping, loadQueryInfluencers, sessionFactory );
 	}
 
+	private SimpleForeignKeyDescriptor getKeyDescriptor() {
+		return (SimpleForeignKeyDescriptor) getLoadable().getKeyDescriptor();
+	}
+
 	@Override
 	public PersistentCollection<?> load(Object key, SharedSessionContractImplementor session) {
 		if ( MULTI_KEY_LOAD_DEBUG_ENABLED ) {
@@ -120,14 +124,21 @@ public class CollectionBatchLoaderArrayParam
 	}
 
 	private Object[] resolveKeysToInitialize(Object keyBeingLoaded, SharedSessionContractImplementor session) {
-		final Object[] keysToInitialize = (Object[]) Array.newInstance( arrayElementType, getDomainBatchSize() );
-		session.getPersistenceContextInternal().getBatchFetchQueue().collectBatchLoadableCollectionKeys(
-				getDomainBatchSize(),
-				(index, value) -> keysToInitialize[index] = value,
-				keyBeingLoaded,
-				getLoadable()
-		);
-		return keysToInitialize;
+		final int length = getDomainBatchSize();
+		final Class<?> keyType = getKeyDescriptor().getJavaType().getJavaTypeClass();
+		final Object[] keysToInitialize = (Object[]) Array.newInstance( keyType, length );
+		session.getPersistenceContextInternal().getBatchFetchQueue()
+				.collectBatchLoadableCollectionKeys(
+						length,
+						(index, value) -> keysToInitialize[index] = value,
+						keyBeingLoaded,
+						getLoadable()
+				);
+		int newLength = length;
+		while ( newLength>1 && keysToInitialize[newLength-1] == null ) {
+			newLength--;
+		}
+		return newLength < length ? Arrays.copyOf( keysToInitialize, newLength ) : keysToInitialize;
 	}
 
 	private void initializeKeys(Object[] keysToInitialize, SharedSessionContractImplementor session) {
@@ -162,7 +173,4 @@ public class CollectionBatchLoaderArrayParam
 			finishInitializingKey( keysToInitialize[i], session );
 		}
 	}
-
-	public void prepare() {
-	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityBatchLoaderArrayParam.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityBatchLoaderArrayParam.java
index e4dc4bf761..e7be0f85f6 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityBatchLoaderArrayParam.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityBatchLoaderArrayParam.java
@@ -7,6 +7,7 @@
 package org.hibernate.loader.ast.internal;
 
 import java.lang.reflect.Array;
+import java.util.Arrays;
 import java.util.Locale;
 
 import org.hibernate.LockOptions;
@@ -137,14 +138,20 @@ public class EntityBatchLoaderArrayParam<T>
 	}
 
 	protected Object[] resolveIdsToInitialize(Object pkValue, SharedSessionContractImplementor session) {
-		final Object[] idsToLoad = (Object[]) Array.newInstance( identifierMapping.getJavaType().getJavaTypeClass(), domainBatchSize );
-		session.getPersistenceContextInternal().getBatchFetchQueue().collectBatchLoadableEntityIds(
-				domainBatchSize,
-				(index, value) -> idsToLoad[index] = value,
-				pkValue,
-				getLoadable()
-		);
-		return idsToLoad;
+		final Class<?> idType = identifierMapping.getJavaType().getJavaTypeClass();
+		final Object[] idsToLoad = (Object[]) Array.newInstance( idType, domainBatchSize );
+		session.getPersistenceContextInternal().getBatchFetchQueue()
+				.collectBatchLoadableEntityIds(
+						domainBatchSize,
+						(index, value) -> idsToLoad[index] = value,
+						pkValue,
+						getLoadable()
+				);
+		int newLength = domainBatchSize;
+		while ( newLength>1 && idsToLoad[newLength-1] == null ) {
+			newLength--;
+		}
+		return newLength < domainBatchSize ? Arrays.copyOf( idsToLoad, newLength ) : idsToLoad;
 	}
 
 	private void initializeEntities(