diff --git a/src/main/java/net/openhft/chronicle/map/ClientWiredStatelessChronicleMap.java b/src/main/java/net/openhft/chronicle/map/ClientWiredStatelessChronicleMap.java
index f9681445d..b3139eafe 100644
--- a/src/main/java/net/openhft/chronicle/map/ClientWiredStatelessChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/ClientWiredStatelessChronicleMap.java
@@ -328,23 +328,25 @@ class ClientWiredStatelessChronicleMap<K, V> extends MapStatelessClient<K, V, Ev
     @NotNull
     public Set<Map.Entry<K, V>> entrySet() {
 
-        final long[] cidRef = new long[1];
 
-        proxyReturnWireConsumer(entrySet, (WireIn wireIn) -> {
+
+        long cid = proxyReturnWireConsumer(entrySet, (WireIn wireIn) -> {
+            final long[] cidRef = new long[1];
             final StringBuilder type = Wires.acquireStringBuilder();
             final ValueIn read = wireIn.read(reply);
             read.type(type);
             read.marshallable(w -> {
 
                 final String csp1 = w.read(CoreFields.csp).text();
-                final long cid = w.read(CoreFields.cid).int64();
-                cidToCsp.put(cid, csp1);
-                cidRef[0] = cid;
+                final long cid0 = w.read(CoreFields.cid).int64();
+                cidToCsp.put(cid0, csp1);
+                cidRef[0] = cid0;
 
             });
+            return  cidRef[0];
         });
 
-        return new ClientWiredStatelessChronicleEntrySet<K, V>(channelName, hub, cidRef[0], vClass);
+        return new ClientWiredStatelessChronicleEntrySet<K, V>(channelName, hub, cid, vClass);
     }