diff --git a/app/assets/javascripts/editor/execution.js b/app/assets/javascripts/editor/execution.js
index 69f841b7..c4248ae4 100644
--- a/app/assets/javascripts/editor/execution.js
+++ b/app/assets/javascripts/editor/execution.js
@@ -12,10 +12,12 @@ CodeOceanEditorWebsocket = {
       sockURL.hash = '';
 
       if (span) {
-        sockURL.searchParams.set('HTTP_SENTRY_TRACE', span.toTraceparent());
         const dynamicContext = this.sentryTransaction.getDynamicSamplingContext();
         const baggage = SentryUtils.dynamicSamplingContextToSentryBaggageHeader(dynamicContext);
-        sockURL.searchParams.set('HTTP_BAGGAGE', baggage);
+        if (baggage) {
+          sockURL.searchParams.set('HTTP_SENTRY_TRACE', span.toTraceparent());
+          sockURL.searchParams.set('HTTP_BAGGAGE', baggage);
+        }
       }
 
       return sockURL.toString();