diff --git a/Gemfile.lock b/Gemfile.lock
index 6d56101a..b94c736f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -224,7 +224,7 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.4)
-    minitest (5.19.0)
+    minitest (5.20.0)
     mnemosyne-ruby (1.16.0)
       activesupport (>= 4)
       bunny
@@ -431,10 +431,10 @@ GEM
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
     semantic_range (3.0.0)
-    sentry-rails (5.10.0)
+    sentry-rails (5.11.0)
       railties (>= 5.0)
-      sentry-ruby (~> 5.10.0)
-    sentry-ruby (5.10.0)
+      sentry-ruby (~> 5.11.0)
+    sentry-ruby (5.11.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
     set (1.0.3)
     shakapacker (7.0.3)
diff --git a/lib/runner/connection.rb b/lib/runner/connection.rb
index 1500e756..f41bf9e0 100644
--- a/lib/runner/connection.rb
+++ b/lib/runner/connection.rb
@@ -265,17 +265,8 @@ class Runner::Connection
   def sentry_trace_header(sentry_span)
     return {} unless sentry_span
 
-    http_headers = {}
-    client = Sentry.get_current_client
-
-    trace = client.generate_sentry_trace(sentry_span)
-    http_headers[Sentry::SENTRY_TRACE_HEADER_NAME] = trace if trace
-
-    baggage = client.generate_baggage(sentry_span)
-    http_headers[Sentry::BAGGAGE_HEADER_NAME] = baggage if baggage.present?
-
     {
-      headers: http_headers,
+      headers: Sentry.get_trace_propagation_headers,
     }
   end