diff --git a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
index 0ebb1475e..85c56b2dc 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
@@ -256,7 +256,6 @@ public Flux<KeyValue<K, V>> mget(K... keys) {
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public Flux<KeyValue<K, V>> mget(Iterable<K> keys) {
-
         List<K> keyList = LettuceLists.newList(keys);
         Map<Integer, List<K>> partitioned = SlotHash.partition(codec, keyList);
 
@@ -264,37 +263,25 @@ public Flux<KeyValue<K, V>> mget(Iterable<K> keys) {
             return super.mget(keyList);
         }
 
-        List<Publisher<KeyValue<K, V>>> publishers = new ArrayList<>();
-
-        for (Map.Entry<Integer, List<K>> entry : partitioned.entrySet()) {
-            publishers.add(super.mget(entry.getValue()));
-        }
-
-        Flux<KeyValue<K, V>> fluxes = Flux.mergeSequential(publishers);
+        List<Publisher<KeyValue<K, V>>> publishers = partitioned.values().stream().map(super::mget)
+                .collect(Collectors.toList());
 
-        Mono<List<KeyValue<K, V>>> map = fluxes.collectList().map(vs -> {
-
-            KeyValue<K, V>[] values = new KeyValue[vs.size()];
+        return Flux.mergeSequential(publishers).collectList().map(results -> {
+            KeyValue<K, V>[] values = new KeyValue[keyList.size()];
             int offset = 0;
-            for (Map.Entry<Integer, List<K>> entry : partitioned.entrySet()) {
 
+            for (List<K> partitionKeys : partitioned.values()) {
                 for (int i = 0; i < keyList.size(); i++) {
-
-                    int index = entry.getValue().indexOf(keyList.get(i));
-                    if (index == -1) {
-                        continue;
+                    int index = partitionKeys.indexOf(keyList.get(i));
+                    if (index != -1) {
+                        values[i] = results.get(offset + index);
                     }
-
-                    values[i] = vs.get(offset + index);
                 }
-
-                offset += entry.getValue().size();
+                offset += partitionKeys.size();
             }
 
             return Arrays.asList(values);
-        });
-
-        return map.flatMapIterable(keyValues -> keyValues);
+        }).flatMapMany(Flux::fromIterable);
     }
 
     @Override