diff --git a/internal/metrics/listener.go b/internal/metrics/listener.go
index 881da25..96a328b 100644
--- a/internal/metrics/listener.go
+++ b/internal/metrics/listener.go
@@ -97,7 +97,7 @@ func MakeListener(config Config, extensionManager *extension.ExtensionManager) L
 	// Agent instead of using this "discovery" implementation.
 	if extensionManager.IsExtensionRunning() {
 		var err error
-		if statsdClient, err = statsd.New("127.0.0.1:8125"); err != nil {
+		if statsdClient, err = statsd.New("127.0.0.1:8125", statsd.WithoutTelemetry()); err != nil {
 			statsdClient = nil // force nil if an error occurred during statsd client init
 		}
 	}
diff --git a/internal/trace/listener.go b/internal/trace/listener.go
index 89f3417..bbd4463 100644
--- a/internal/trace/listener.go
+++ b/internal/trace/listener.go
@@ -125,6 +125,7 @@ func (l *Listener) HandlerFinished(ctx context.Context, err error) {
 		}
 	}
 
+	tracer.Stop()
 	tracer.Flush()
 }