diff --git a/services/collaboration/pkg/middleware/tracing.go b/services/collaboration/pkg/middleware/tracing.go
index 4b78352370..869549458a 100644
--- a/services/collaboration/pkg/middleware/tracing.go
+++ b/services/collaboration/pkg/middleware/tracing.go
@@ -21,6 +21,7 @@ func CollaborationTracingMiddleware(next http.Handler) http.Handler {
 		if err != nil {
 			// if we can't get the context, skip this middleware
 			next.ServeHTTP(w, r)
+			return
 		}
 
 		span := trace.SpanFromContext(r.Context())