diff --git a/ts/src/client.ts b/ts/src/client.ts
index 0a653678..41f02450 100644
--- a/ts/src/client.ts
+++ b/ts/src/client.ts
@@ -209,6 +209,7 @@ class GrpcClient<TRequest extends ProtobufMessage, TResponse extends ProtobufMes
 
     this.onEndCallbacks.forEach(callback => {
       detach(() => {
+        if (this.closed) return;
         callback(code, message, trailers);
       });
     });
@@ -230,6 +231,7 @@ class GrpcClient<TRequest extends ProtobufMessage, TResponse extends ProtobufMes
     this.completed = true;
     this.onEndCallbacks.forEach(callback => {
       detach(() => {
+        if (this.closed) return;
         callback(code, msg, trailers);
       });
     });
@@ -240,6 +242,7 @@ class GrpcClient<TRequest extends ProtobufMessage, TResponse extends ProtobufMes
     if (this.completed || this.closed) return;
     this.onMessageCallbacks.forEach(callback => {
       detach(() => {
+        if (this.closed) return;
         callback(res);
       });
     });