diff --git a/packages/grpc-js/package.json b/packages/grpc-js/package.json
index 700c7b773..d9ef213db 100644
--- a/packages/grpc-js/package.json
+++ b/packages/grpc-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@grpc/grpc-js",
-  "version": "1.8.3",
+  "version": "1.8.4",
   "description": "gRPC Library for Node - pure JS implementation",
   "homepage": "https://grpc.io/",
   "repository": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js",
diff --git a/packages/grpc-js/src/transport.ts b/packages/grpc-js/src/transport.ts
index 64f770945..fc9042278 100644
--- a/packages/grpc-js/src/transport.ts
+++ b/packages/grpc-js/src/transport.ts
@@ -354,12 +354,14 @@ class Http2Transport implements Transport {
   private removeActiveCall(call: Http2SubchannelCall) {
     this.activeCalls.delete(call);
     if (this.activeCalls.size === 0 && !this.keepaliveWithoutCalls) {
+      this.session.unref();
       this.stopKeepalivePings();
     }
   }
 
   private addActiveCall(call: Http2SubchannelCall) {
     if (this.activeCalls.size === 0 && !this.keepaliveWithoutCalls) {
+      this.session.ref();
       this.startKeepalivePings();
     }
     this.activeCalls.add(call);
@@ -418,6 +420,7 @@ class Http2Transport implements Transport {
         },
         onCallEnd: status => {
           subchannelCallStatsTracker.onCallEnd?.(status);
+          this.removeActiveCall(call);
         },
         onStreamEnd: success => {
           if (success) {
@@ -425,7 +428,6 @@ class Http2Transport implements Transport {
           } else {
             this.streamTracker.addCallFailed();
           }
-          this.removeActiveCall(call);
           subchannelCallStatsTracker.onStreamEnd?.(success);
         }
       }