diff --git a/sentry_sdk/scope.py b/sentry_sdk/scope.py index 3ad61d31d5..c25b5efec2 100644 --- a/sentry_sdk/scope.py +++ b/sentry_sdk/scope.py @@ -605,11 +605,11 @@ def _drop(cause, ty): contexts = event.setdefault("contexts", {}) - if has_tracing_enabled(options): - if self._span is not None: + if contexts.get("trace") is None: + if has_tracing_enabled(options) and self._span is not None: contexts["trace"] = self._span.get_trace_context() - else: - contexts["trace"] = self.get_trace_context() + else: + contexts["trace"] = self.get_trace_context() exc_info = hint.get("exc_info") if exc_info is not None: