diff --git a/runtime/src/main/java/org/capnproto/Capability.java b/runtime/src/main/java/org/capnproto/Capability.java
index ff8b593..9bf9e28 100644
--- a/runtime/src/main/java/org/capnproto/Capability.java
+++ b/runtime/src/main/java/org/capnproto/Capability.java
@@ -738,8 +738,8 @@ public final class Capability {
         // resolves).
 
         private ClientHook redirect;
-        private final Queue<CompletableFuture<ClientHook>> queuedCalls = new ArrayDeque<>();
-        private final Queue<LocalRequest> pendingCalls = new ArrayDeque<>();
+        private final List<CompletableFuture<ClientHook>> queuedCalls = new ArrayList<>();
+        private final List<LocalRequest> pendingCalls = new ArrayList<>();
 
         QueuedClient(CompletableFuture<ClientHook> promise) {
             this.selfResolutionOp = promise.handle((inner, exc) -> {
@@ -760,6 +760,9 @@ public final class Capability {
                     hook.releaseCall();
                 }
 
+                this.queuedCalls.clear();
+                this.pendingCalls.clear();
+
                 return null;
             });
         }