diff --git a/packages/grpc-js/src/subchannel-call.ts b/packages/grpc-js/src/subchannel-call.ts
index a560ed4d..16ac35b5 100644
--- a/packages/grpc-js/src/subchannel-call.ts
+++ b/packages/grpc-js/src/subchannel-call.ts
@@ -198,6 +198,7 @@ export class Http2SubchannelCall implements SubchannelCall {
        * we can bubble up the error message from that event. */
       process.nextTick(() => {
         this.trace('HTTP/2 stream closed with code ' + http2Stream.rstCode);
+        this.callEventTracker.onStreamEnd(this.finalStatus?.code === Status.OK);
         /* If we have a final status with an OK status code, that means that
          * we have received all of the messages and we have processed the
          * trailers and the call completed successfully, so it doesn't matter
@@ -288,7 +289,6 @@ export class Http2SubchannelCall implements SubchannelCall {
         );
         this.internalError = err;
       }
-      this.callEventTracker.onStreamEnd(false);
     });
   }
 
@@ -403,7 +403,6 @@ export class Http2SubchannelCall implements SubchannelCall {
   }
 
   private handleTrailers(headers: http2.IncomingHttpHeaders) {
-    this.callEventTracker.onStreamEnd(true);
     let headersString = '';
     for (const header of Object.keys(headers)) {
       headersString += '\t\t' + header + ': ' + headers[header] + '\n';
diff --git a/packages/grpc-js/src/transport.ts b/packages/grpc-js/src/transport.ts
index 31497102..fc904227 100644
--- a/packages/grpc-js/src/transport.ts
+++ b/packages/grpc-js/src/transport.ts
@@ -420,6 +420,7 @@ class Http2Transport implements Transport {
         },
         onCallEnd: status => {
           subchannelCallStatsTracker.onCallEnd?.(status);
+          this.removeActiveCall(call);
         },
         onStreamEnd: success => {
           if (success) {
@@ -427,7 +428,6 @@ class Http2Transport implements Transport {
           } else {
             this.streamTracker.addCallFailed();
           }
-          this.removeActiveCall(call);
           subchannelCallStatsTracker.onStreamEnd?.(success);
         }
       }