From 9533fc43d52c81f67278cc9767fd84d44feb1606 Mon Sep 17 00:00:00 2001
From: Marco Saia <marco.saia@datadoghq.com>
Date: Tue, 4 Nov 2025 09:08:43 +0100
Subject: [PATCH] Clear cached RUM Session ID on stopSession

---
 packages/core/src/rum/DdRum.ts                     | 2 ++
 packages/core/src/rum/sessionId/sessionIdHelper.ts | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/packages/core/src/rum/DdRum.ts b/packages/core/src/rum/DdRum.ts
index 8943ed5b0..cbd06f4fe 100644
--- a/packages/core/src/rum/DdRum.ts
+++ b/packages/core/src/rum/DdRum.ts
@@ -31,6 +31,7 @@ import {
     getTracingContextForPropagators
 } from './instrumentation/resourceTracking/distributedTracing/distributedTracingHeaders';
 import {
+    clearCachedSessionId,
     getCachedSessionId,
     setCachedSessionId
 } from './sessionId/sessionIdHelper';
@@ -295,6 +296,7 @@ class DdRumWrapper implements DdRumType {
 
     stopSession = (): Promise<void> => {
         InternalLog.log('Stopping RUM Session', SdkVerbosity.DEBUG);
+        clearCachedSessionId();
         return bufferVoidNativeCall(() => this.nativeRum.stopSession());
     };
 
diff --git a/packages/core/src/rum/sessionId/sessionIdHelper.ts b/packages/core/src/rum/sessionId/sessionIdHelper.ts
index 64e56fecb..887b75984 100644
--- a/packages/core/src/rum/sessionId/sessionIdHelper.ts
+++ b/packages/core/src/rum/sessionId/sessionIdHelper.ts
@@ -12,3 +12,7 @@ export const getCachedSessionId = () => {
 export const setCachedSessionId = (sessionId: string) => {
     _cachedSessionId = sessionId;
 };
+
+export const clearCachedSessionId = () => {
+    _cachedSessionId = undefined;
+};