diff --git a/src/sentry/uptime/issue_platform.py b/src/sentry/uptime/issue_platform.py
index bd7e1583e5b006..a74e652812ee6c 100644
--- a/src/sentry/uptime/issue_platform.py
+++ b/src/sentry/uptime/issue_platform.py
@@ -101,7 +101,7 @@ def build_event_data_for_occurrence(
             "uptime_rule": str(project_subscription.id),
         },
         "timestamp": occurrence.detection_time.isoformat(),
-        "contexts": {"trace": {"trace_id": result["trace_id"], "span_id": None}},
+        "contexts": {"trace": {"trace_id": result["trace_id"], "span_id": result.get("span_id")}},
     }
 
 
diff --git a/tests/sentry/uptime/test_issue_platform.py b/tests/sentry/uptime/test_issue_platform.py
index 3ef3381c3a3f09..2ad2ac6bf21fc9 100644
--- a/tests/sentry/uptime/test_issue_platform.py
+++ b/tests/sentry/uptime/test_issue_platform.py
@@ -106,7 +106,9 @@ def test(self):
             "sdk": None,
             "tags": {"uptime_rule": str(project_subscription.id)},
             "timestamp": occurrence.detection_time.isoformat(),
-            "contexts": {"trace": {"trace_id": result["trace_id"], "span_id": None}},
+            "contexts": {
+                "trace": {"trace_id": result["trace_id"], "span_id": result.get("span_id")}
+            },
         }