diff --git a/accounts/pkg/tracing/tracing.go b/accounts/pkg/tracing/tracing.go
index ab83f0fc8..4da38009f 100644
--- a/accounts/pkg/tracing/tracing.go
+++ b/accounts/pkg/tracing/tracing.go
@@ -13,8 +13,10 @@ var (
 
 func Configure(cfg *config.Config) error {
 	var err error
-	if TraceProvider, err = pkgtrace.GetTraceProvider(cfg.Tracing.Endpoint, cfg.Tracing.Collector, "accounts", cfg.Tracing.Type); err != nil {
-		return err
+	if cfg.Tracing.Enabled {
+		if TraceProvider, err = pkgtrace.GetTraceProvider(cfg.Tracing.Endpoint, cfg.Tracing.Collector, "accounts", cfg.Tracing.Type); err != nil {
+			return err
+		}
 	}
 
 	return nil
diff --git a/glauth/pkg/tracing/tracing.go b/glauth/pkg/tracing/tracing.go
index 20a2dfd10..a02161687 100644
--- a/glauth/pkg/tracing/tracing.go
+++ b/glauth/pkg/tracing/tracing.go
@@ -13,8 +13,10 @@ var (
 
 func Configure(cfg *config.Config) error {
 	var err error
-	if TraceProvider, err = pkgtrace.GetTraceProvider(cfg.Tracing.Endpoint, cfg.Tracing.Collector, "glauth", cfg.Tracing.Type); err != nil {
-		return err
+	if cfg.Tracing.Enabled {
+		if TraceProvider, err = pkgtrace.GetTraceProvider(cfg.Tracing.Endpoint, cfg.Tracing.Collector, "glauth", cfg.Tracing.Type); err != nil {
+			return err
+		}
 	}
 
 	return nil
diff --git a/graph-explorer/pkg/tracing/tracing.go b/graph-explorer/pkg/tracing/tracing.go
index 88e057a80..b7fe7a3f6 100644
--- a/graph-explorer/pkg/tracing/tracing.go
+++ b/graph-explorer/pkg/tracing/tracing.go
@@ -13,8 +13,10 @@ var (
 
 func Configure(cfg *config.Config) error {
 	var err error
-	if TraceProvider, err = pkgtrace.GetTraceProvider(cfg.Tracing.Endpoint, cfg.Tracing.Collector, "graph-explorer", cfg.Tracing.Type); err != nil {
-		return err
+	if cfg.Tracing.Enabled {
+		if TraceProvider, err = pkgtrace.GetTraceProvider(cfg.Tracing.Endpoint, cfg.Tracing.Collector, "graph-explorer", cfg.Tracing.Type); err != nil {
+			return err
+		}
 	}
 
 	return nil
diff --git a/graph/pkg/tracing/tracing.go b/graph/pkg/tracing/tracing.go
index 5fcbd521d..5e67b08eb 100644
--- a/graph/pkg/tracing/tracing.go
+++ b/graph/pkg/tracing/tracing.go
@@ -13,8 +13,10 @@ var (
 
 func Configure(cfg *config.Config) error {
 	var err error
-	if TraceProvider, err = pkgtrace.GetTraceProvider(cfg.Tracing.Endpoint, cfg.Tracing.Collector, "graph", cfg.Tracing.Type); err != nil {
-		return err
+	if cfg.Tracing.Enabled {
+		if TraceProvider, err = pkgtrace.GetTraceProvider(cfg.Tracing.Endpoint, cfg.Tracing.Collector, "graph", cfg.Tracing.Type); err != nil {
+			return err
+		}
 	}
 
 	return nil
diff --git a/idp/pkg/tracing/tracing.go b/idp/pkg/tracing/tracing.go
index d64481e90..eb116d6ce 100644
--- a/idp/pkg/tracing/tracing.go
+++ b/idp/pkg/tracing/tracing.go
@@ -13,8 +13,10 @@ var (
 
 func Configure(cfg *config.Config) error {
 	var err error
-	if TraceProvider, err = pkgtrace.GetTraceProvider(cfg.Tracing.Endpoint, cfg.Tracing.Collector, "idp", cfg.Tracing.Type); err != nil {
-		return err
+	if cfg.Tracing.Enabled {
+		if TraceProvider, err = pkgtrace.GetTraceProvider(cfg.Tracing.Endpoint, cfg.Tracing.Collector, "idp", cfg.Tracing.Type); err != nil {
+			return err
+		}
 	}
 
 	return nil
diff --git a/ocs/pkg/tracing/tracing.go b/ocs/pkg/tracing/tracing.go
index 771085c16..d79ef622f 100644
--- a/ocs/pkg/tracing/tracing.go
+++ b/ocs/pkg/tracing/tracing.go
@@ -13,8 +13,10 @@ var (
 
 func Configure(cfg *config.Config) error {
 	var err error
-	if TraceProvider, err = pkgtrace.GetTraceProvider(cfg.Tracing.Endpoint, cfg.Tracing.Collector, "ocs", cfg.Tracing.Type); err != nil {
-		return err
+	if cfg.Tracing.Enabled {
+		if TraceProvider, err = pkgtrace.GetTraceProvider(cfg.Tracing.Endpoint, cfg.Tracing.Collector, "ocs", cfg.Tracing.Type); err != nil {
+			return err
+		}
 	}
 
 	return nil
diff --git a/proxy/pkg/tracing/tracing.go b/proxy/pkg/tracing/tracing.go
index d88d07332..e3b3aa50c 100644
--- a/proxy/pkg/tracing/tracing.go
+++ b/proxy/pkg/tracing/tracing.go
@@ -13,8 +13,10 @@ var (
 
 func Configure(cfg *config.Config) error {
 	var err error
-	if TraceProvider, err = pkgtrace.GetTraceProvider(cfg.Tracing.Endpoint, cfg.Tracing.Collector, "proxy", cfg.Tracing.Type); err != nil {
-		return err
+	if cfg.Tracing.Enabled {
+		if TraceProvider, err = pkgtrace.GetTraceProvider(cfg.Tracing.Endpoint, cfg.Tracing.Collector, "proxy", cfg.Tracing.Type); err != nil {
+			return err
+		}
 	}
 
 	return nil
diff --git a/settings/pkg/tracing/tracing.go b/settings/pkg/tracing/tracing.go
index b3ce213c6..09d85008b 100644
--- a/settings/pkg/tracing/tracing.go
+++ b/settings/pkg/tracing/tracing.go
@@ -13,8 +13,10 @@ var (
 
 func Configure(cfg *config.Config) error {
 	var err error
-	if TraceProvider, err = pkgtrace.GetTraceProvider(cfg.Tracing.Endpoint, cfg.Tracing.Collector, "settings", cfg.Tracing.Type); err != nil {
-		return err
+	if cfg.Tracing.Enabled {
+		if TraceProvider, err = pkgtrace.GetTraceProvider(cfg.Tracing.Endpoint, cfg.Tracing.Collector, "settings", cfg.Tracing.Type); err != nil {
+			return err
+		}
 	}
 
 	return nil
diff --git a/store/pkg/tracing/tracing.go b/store/pkg/tracing/tracing.go
index 1cf23565d..b6f66479f 100644
--- a/store/pkg/tracing/tracing.go
+++ b/store/pkg/tracing/tracing.go
@@ -13,8 +13,10 @@ var (
 
 func Configure(cfg *config.Config) error {
 	var err error
-	if TraceProvider, err = pkgtrace.GetTraceProvider(cfg.Tracing.Endpoint, cfg.Tracing.Collector, "store", cfg.Tracing.Type); err != nil {
-		return err
+	if cfg.Tracing.Enabled {
+		if TraceProvider, err = pkgtrace.GetTraceProvider(cfg.Tracing.Endpoint, cfg.Tracing.Collector, "store", cfg.Tracing.Type); err != nil {
+			return err
+		}
 	}
 
 	return nil
diff --git a/thumbnails/pkg/tracing/tracing.go b/thumbnails/pkg/tracing/tracing.go
index 19adcc762..6bbd7afc8 100644
--- a/thumbnails/pkg/tracing/tracing.go
+++ b/thumbnails/pkg/tracing/tracing.go
@@ -13,8 +13,10 @@ var (
 
 func Configure(cfg *config.Config) error {
 	var err error
-	if TraceProvider, err = pkgtrace.GetTraceProvider(cfg.Tracing.Endpoint, cfg.Tracing.Collector, "thumbnails", cfg.Tracing.Type); err != nil {
-		return err
+	if cfg.Tracing.Enabled {
+		if TraceProvider, err = pkgtrace.GetTraceProvider(cfg.Tracing.Endpoint, cfg.Tracing.Collector, "thumbnails", cfg.Tracing.Type); err != nil {
+			return err
+		}
 	}
 
 	return nil
diff --git a/web/pkg/tracing/tracing.go b/web/pkg/tracing/tracing.go
index 31b46e4c1..1bd7caf66 100644
--- a/web/pkg/tracing/tracing.go
+++ b/web/pkg/tracing/tracing.go
@@ -13,8 +13,10 @@ var (
 
 func Configure(cfg *config.Config) error {
 	var err error
-	if TraceProvider, err = pkgtrace.GetTraceProvider(cfg.Tracing.Endpoint, cfg.Tracing.Collector, "web", cfg.Tracing.Type); err != nil {
-		return err
+	if cfg.Tracing.Enabled {
+		if TraceProvider, err = pkgtrace.GetTraceProvider(cfg.Tracing.Endpoint, cfg.Tracing.Collector, "web", cfg.Tracing.Type); err != nil {
+			return err
+		}
 	}
 
 	return nil
diff --git a/webdav/pkg/tracing/tracing.go b/webdav/pkg/tracing/tracing.go
index 891bfdb23..f3efeecd0 100644
--- a/webdav/pkg/tracing/tracing.go
+++ b/webdav/pkg/tracing/tracing.go
@@ -13,8 +13,10 @@ var (
 
 func Configure(cfg *config.Config) error {
 	var err error
-	if TraceProvider, err = pkgtrace.GetTraceProvider(cfg.Tracing.Endpoint, cfg.Tracing.Collector, "webdav", cfg.Tracing.Type); err != nil {
-		return err
+	if cfg.Tracing.Enabled {
+		if TraceProvider, err = pkgtrace.GetTraceProvider(cfg.Tracing.Endpoint, cfg.Tracing.Collector, "webdav", cfg.Tracing.Type); err != nil {
+			return err
+		}
 	}
 
 	return nil