diff --git a/arch/arm64/kvm/hyp/nvhe/alloc.c b/arch/arm64/kvm/hyp/nvhe/alloc.c
index e29db651cfe1..853b543a7142 100644
--- a/arch/arm64/kvm/hyp/nvhe/alloc.c
+++ b/arch/arm64/kvm/hyp/nvhe/alloc.c
@@ -523,7 +523,7 @@ static struct chunk_hdr *
 get_free_chunk(struct hyp_allocator *allocator, size_t size)
 {
 	struct chunk_hdr *chunk, *best_chunk = NULL;
-	size_t best_available_size = allocator->size;
+	size_t best_available_size = SIZE_MAX;
 
 	list_for_each_entry(chunk, &allocator->chunks, node) {
 		size_t available_size = chunk->mapped_size +
@@ -534,11 +534,6 @@ get_free_chunk(struct hyp_allocator *allocator, size_t size)
 		if (chunk_size(size) > available_size)
 			continue;
 
-		if (!best_chunk) {
-			best_chunk = chunk;
-			continue;
-		}
-
 		if (best_available_size <= available_size)
 			continue;