diff --git a/accounts/pkg/tracing/tracing.go b/accounts/pkg/tracing/tracing.go
index 5004b54fb..dbef82f75 100644
--- a/accounts/pkg/tracing/tracing.go
+++ b/accounts/pkg/tracing/tracing.go
@@ -15,7 +15,7 @@ var (
 	Propagator propagation.TextMapPropagator
 
 	// TraceProvider is the global trace provider for the proxy service.
-	TraceProvider *sdktrace.TracerProvider
+	TraceProvider = sdktrace.NewTracerProvider()
 )
 
 func Configure(cfg *config.Config, logger log.Logger) error {
diff --git a/idp/pkg/server/http/server.go b/idp/pkg/server/http/server.go
index 3b3b363f8..988f5bc38 100644
--- a/idp/pkg/server/http/server.go
+++ b/idp/pkg/server/http/server.go
@@ -74,7 +74,7 @@ func Server(opts ...Option) (http.Service, error) {
 	)
 
 	{
-		handle = svc.NewTracing(handle)
+		//handle = svc.NewTracing(handle)
 		handle = svc.NewInstrument(handle, options.Metrics)
 		handle = svc.NewLogging(handle, options.Logger)
 	}
diff --git a/idp/pkg/tracing/tracing.go b/idp/pkg/tracing/tracing.go
index 56c7df873..7919a1a7f 100644
--- a/idp/pkg/tracing/tracing.go
+++ b/idp/pkg/tracing/tracing.go
@@ -15,7 +15,7 @@ var (
 	Propagator propagation.TextMapPropagator
 
 	// TraceProvider is the global trace provider for the proxy service.
-	TraceProvider *sdktrace.TracerProvider
+	TraceProvider = sdktrace.NewTracerProvider()
 )
 
 func Configure(cfg *config.Config, logger log.Logger) error {
diff --git a/ocs/pkg/tracing/tracing.go b/ocs/pkg/tracing/tracing.go
index 9b8f94a1f..309270d04 100644
--- a/ocs/pkg/tracing/tracing.go
+++ b/ocs/pkg/tracing/tracing.go
@@ -15,7 +15,7 @@ var (
 	Propagator propagation.TextMapPropagator
 
 	// TraceProvider is the global trace provider for the proxy service.
-	TraceProvider *sdktrace.TracerProvider
+	TraceProvider = sdktrace.NewTracerProvider()
 )
 
 func Configure(cfg *config.Config, logger log.Logger) error {
diff --git a/proxy/pkg/tracing/tracing.go b/proxy/pkg/tracing/tracing.go
index 4d6a7e5b3..5b1b69975 100644
--- a/proxy/pkg/tracing/tracing.go
+++ b/proxy/pkg/tracing/tracing.go
@@ -15,7 +15,7 @@ var (
 	Propagator propagation.TextMapPropagator
 
 	// TraceProvider is the global trace provider for the proxy service.
-	TraceProvider *sdktrace.TracerProvider
+	TraceProvider = sdktrace.NewTracerProvider()
 )
 
 func Configure(cfg *config.Config, logger log.Logger) error {
diff --git a/store/pkg/tracing/tracing.go b/store/pkg/tracing/tracing.go
index fca7419ac..27af6fe2a 100644
--- a/store/pkg/tracing/tracing.go
+++ b/store/pkg/tracing/tracing.go
@@ -15,7 +15,7 @@ var (
 	Propagator propagation.TextMapPropagator
 
 	// TraceProvider is the global trace provider for the proxy service.
-	TraceProvider *sdktrace.TracerProvider
+	TraceProvider = sdktrace.NewTracerProvider()
 )
 
 func Configure(cfg *config.Config, logger log.Logger) error {
diff --git a/thumbnails/pkg/service/v0/tracing.go b/thumbnails/pkg/service/v0/tracing.go
index 3850860d7..a6d3c15e1 100644
--- a/thumbnails/pkg/service/v0/tracing.go
+++ b/thumbnails/pkg/service/v0/tracing.go
@@ -3,6 +3,8 @@ package svc
 import (
 	"context"
 
+	"go.opentelemetry.io/otel/trace"
+
 	v0proto "github.com/owncloud/ocis/thumbnails/pkg/proto/v0"
 	thumbnailsTracing "github.com/owncloud/ocis/thumbnails/pkg/tracing"
 	"go.opentelemetry.io/otel/attribute"
@@ -21,16 +23,20 @@ type tracing struct {
 
 // GetThumbnail implements the ThumbnailServiceHandler interface.
 func (t tracing) GetThumbnail(ctx context.Context, req *v0proto.GetThumbnailRequest, rsp *v0proto.GetThumbnailResponse) error {
-	tracer := thumbnailsTracing.TraceProvider.Tracer("thumbnails")
-	ctx, span := tracer.Start(ctx, "Thumbnails.GetThumbnail")
-	defer span.End()
+	var span trace.Span
 
-	span.SetAttributes(
-		attribute.KeyValue{"filepath", attribute.StringValue(req.Filepath)},
-		attribute.KeyValue{"thumbnail_type", attribute.StringValue(req.ThumbnailType.String())},
-		attribute.KeyValue{"width", attribute.IntValue(int(req.Width))},
-		attribute.KeyValue{"height", attribute.IntValue(int(req.Height))},
-	)
+	if thumbnailsTracing.TraceProvider != nil {
+		tracer := thumbnailsTracing.TraceProvider.Tracer("thumbnails")
+		ctx, span = tracer.Start(ctx, "Thumbnails.GetThumbnail")
+		defer span.End()
+
+		span.SetAttributes(
+			attribute.KeyValue{"filepath", attribute.StringValue(req.Filepath)},
+			attribute.KeyValue{"thumbnail_type", attribute.StringValue(req.ThumbnailType.String())},
+			attribute.KeyValue{"width", attribute.IntValue(int(req.Width))},
+			attribute.KeyValue{"height", attribute.IntValue(int(req.Height))},
+		)
+	}
 
 	return t.next.GetThumbnail(ctx, req, rsp)
 }
diff --git a/thumbnails/pkg/tracing/tracing.go b/thumbnails/pkg/tracing/tracing.go
index eb6e16626..29b04b6df 100644
--- a/thumbnails/pkg/tracing/tracing.go
+++ b/thumbnails/pkg/tracing/tracing.go
@@ -15,7 +15,7 @@ var (
 	Propagator propagation.TextMapPropagator
 
 	// TraceProvider is the global trace provider for the proxy service.
-	TraceProvider *sdktrace.TracerProvider
+	TraceProvider = sdktrace.NewTracerProvider()
 )
 
 func Configure(cfg *config.Config, logger log.Logger) error {