diff --git a/packages/grpc-js/package.json b/packages/grpc-js/package.json
index c17d5e6ba..9e1dfcba6 100644
--- a/packages/grpc-js/package.json
+++ b/packages/grpc-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@grpc/grpc-js",
-  "version": "1.8.6",
+  "version": "1.8.7",
   "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 a5bf59b3f..a9308471b 100644
--- a/packages/grpc-js/src/transport.ts
+++ b/packages/grpc-js/src/transport.ts
@@ -354,16 +354,20 @@ class Http2Transport implements Transport {
 
   private removeActiveCall(call: Http2SubchannelCall) {
     this.activeCalls.delete(call);
-    if (this.activeCalls.size === 0 && !this.keepaliveWithoutCalls) {
+    if (this.activeCalls.size === 0) {
       this.session.unref();
-      this.stopKeepalivePings();
+      if (!this.keepaliveWithoutCalls) {
+        this.stopKeepalivePings();
+      }
     }
   }
 
   private addActiveCall(call: Http2SubchannelCall) {
-    if (this.activeCalls.size === 0 && !this.keepaliveWithoutCalls) {
+    if (this.activeCalls.size === 0) {
       this.session.ref();
-      this.startKeepalivePings();
+      if (!this.keepaliveWithoutCalls) {
+        this.startKeepalivePings();
+      }
     }
     this.activeCalls.add(call);
   }