diff --git a/packages/core/src/baseclient.ts b/packages/core/src/baseclient.ts
index 1b9141b14fe0..a6db2788aa52 100644
--- a/packages/core/src/baseclient.ts
+++ b/packages/core/src/baseclient.ts
@@ -647,6 +647,8 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
    */
   protected _sendEnvelope(envelope: Envelope): PromiseLike<void | TransportMakeRequestResponse> | void {
     if (this._transport && this._dsn) {
+      this.emit('beforeEnvelope', envelope);
+
       return this._transport.send(envelope).then(null, reason => {
         __DEBUG_BUILD__ && logger.error('Error while sending event:', reason);
       });
diff --git a/packages/core/src/transports/base.ts b/packages/core/src/transports/base.ts
index 5b11db7e9c17..3111f5f15fca 100644
--- a/packages/core/src/transports/base.ts
+++ b/packages/core/src/transports/base.ts
@@ -24,8 +24,6 @@ import {
   updateRateLimits,
 } from '@sentry/utils';
 
-import { getCurrentHub } from '../hub';
-
 export const DEFAULT_TRANSPORT_BUFFER_SIZE = 30;
 
 /**
@@ -43,13 +41,9 @@ export function createTransport(
 ): Transport {
   let rateLimits: RateLimits = {};
   const flush = (timeout?: number): PromiseLike<boolean> => buffer.drain(timeout);
-  const client = getCurrentHub().getClient();
 
   function send(envelope: Envelope): PromiseLike<void | TransportMakeRequestResponse> {
     const filteredEnvelopeItems: EnvelopeItem[] = [];
-    if (client && client.emit) {
-      client.emit('beforeEnvelope', envelope);
-    }
 
     // Drop rate limited items from envelope
     forEachEnvelopeItem(envelope, (item, type) => {