diff --git a/app/app.go b/app/app.go
index 9433a95..f612fb9 100644
--- a/app/app.go
+++ b/app/app.go
@@ -75,9 +75,7 @@ func NewApp(host string, port int, log logger.Logger, config *viper.Viper) (*App
 }
 
 func (a *App) loadConfigurationDefaults() {
-	a.config.SetDefault("jaeger.disabled", true)
-	a.config.SetDefault("jaeger.samplingProbability", 0.1)
-	a.config.SetDefault("jaeger.serviceName", "events-gateway")
+	a.config.SetDefault("otlp.enabled", false)
 	a.config.SetDefault("kafka.producer.net.maxOpenRequests", 10)
 	a.config.SetDefault("kafka.producer.net.dialTimeout", "500ms")
 	a.config.SetDefault("kafka.producer.net.readTimeout", "250ms")
@@ -100,9 +98,13 @@ func (a *App) loadConfigurationDefaults() {
 
 func (a *App) configure() error {
 	a.loadConfigurationDefaults()
-	if err := a.configureOTel(); err != nil {
-		return err
+
+	if a.config.GetBool("otlp.enabled") {
+		if err := a.configureOTel(); err != nil {
+			return err
+		}
 	}
+
 	err := a.configureEventsForwarder()
 	if err != nil {
 		return err
diff --git a/client/sync_int_test.go b/client/sync_int_test.go
index facc071..42ba8ec 100644
--- a/client/sync_int_test.go
+++ b/client/sync_int_test.go
@@ -41,6 +41,8 @@ var _ = Describe("Sync Client", func() {
 
 		kafkaTopic = fmt.Sprintf("test-%s", uuid.New().String())
 		config.Set("client.kafkatopic", kafkaTopic)
+
+		config.Set("otlp.enabled", true)
 	})
 
 	AfterEach(func() {
@@ -49,6 +51,8 @@ var _ = Describe("Sync Client", func() {
 		if a != nil {
 			a.Stop()
 		}
+
+		config.Set("otlp.enabled", false)
 	})
 
 	startAppAndClient := func() {