diff --git a/lib/instana/instrumentation/rack.rb b/lib/instana/instrumentation/rack.rb
index e0007a8e..90293d5e 100644
--- a/lib/instana/instrumentation/rack.rb
+++ b/lib/instana/instrumentation/rack.rb
@@ -34,6 +34,7 @@ def call(env)
       raise
     ensure
       finalize_trace(current_span, kvs, headers, trace_context) if ::Instana.tracer.tracing?
+      OpenTelemetry::Context.detach(@trace_token) if @trace_token
     end
 
     private
@@ -123,7 +124,6 @@ def merge_response_headers(kvs, headers)
     def finalize_trace(current_span, kvs, headers, trace_context)
       set_response_headers(headers, trace_context) if headers
       current_span.add_attributes(kvs)
-      OpenTelemetry::Context.detach(@trace_token) if @trace_token
       current_span.finish
     end