diff --git a/service/history/handler.go b/service/history/handler.go
index d3850db833..ff41a64a04 100644
--- a/service/history/handler.go
+++ b/service/history/handler.go
@@ -1968,7 +1968,7 @@ func (h *Handler) StreamWorkflowReplicationMessages(
 	server historyservice.HistoryService_StreamWorkflowReplicationMessagesServer,
 ) (retErr error) {
 	// Note that since this is not a unary RPC, we cannot use the interceptor to capture panics.
-	metrics.CapturePanic(h.logger, h.metricsHandler, &retErr)
+	defer metrics.CapturePanic(h.logger, h.metricsHandler, &retErr)
 	getter := headers.NewGRPCHeaderGetter(server.Context())
 	clientClusterShardID, serverClusterShardID, err := history.DecodeClusterShardMD(getter)
 	if err != nil {