diff --git a/static/app/bootstrap/initializeSdk.tsx b/static/app/bootstrap/initializeSdk.tsx
index 80ecff878cc382..50ec274ab9783f 100644
--- a/static/app/bootstrap/initializeSdk.tsx
+++ b/static/app/bootstrap/initializeSdk.tsx
@@ -15,7 +15,6 @@ import {
   useNavigationType,
 } from 'react-router-dom';
 import {useEffect} from 'react';
-import FeatureObserver from 'sentry/utils/featureObserver';
 
 const SPA_MODE_ALLOW_URLS = [
   'localhost',
@@ -183,12 +182,7 @@ export function initializeSdk(config: Config) {
 
       lastEventId = event.event_id || hint.event_id;
 
-      // attach feature flags to the event context
-      if (event.contexts) {
-        const flags = FeatureObserver.singleton({}).getFeatureFlags();
-        event.contexts.flags = flags;
-      }
-
+      Sentry.copyFlagsFromScopeToEvent(event);
       return event;
     },
   });
diff --git a/static/app/utils/featureObserver.ts b/static/app/utils/featureObserver.ts
index 7ce5a198b76ad2..7bea736b244dbf 100644
--- a/static/app/utils/featureObserver.ts
+++ b/static/app/utils/featureObserver.ts
@@ -1,4 +1,5 @@
-import type {Flags} from 'sentry/types/event';
+import {insertFlagToScope} from '@sentry/react';
+
 import type {Organization} from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
 
@@ -22,19 +23,11 @@ export default class FeatureObserver {
   }
 
   private _bufferSize = 0;
-  private FEATURE_FLAGS: Flags = {values: []};
 
   constructor({bufferSize}: {bufferSize: number}) {
     this._bufferSize = bufferSize;
   }
 
-  /**
-   * Return list of recently accessed feature flags.
-   */
-  public getFeatureFlags() {
-    return this.FEATURE_FLAGS;
-  }
-
   public updateFlagBuffer({
     flagName,
     flagResult,
@@ -42,26 +35,7 @@ export default class FeatureObserver {
     flagName: string;
     flagResult: boolean;
   }) {
-    const flagBuffer = this.FEATURE_FLAGS;
-    // Check if the flag is already in the buffer
-    const index = flagBuffer.values.findIndex(f => f.flag === flagName);
-
-    // The flag is already in the buffer
-    if (index !== -1) {
-      flagBuffer.values.splice(index, 1);
-    }
-
-    // If at capacity, we need to remove the earliest flag
-    // This will only happen if not a duplicate flag
-    if (flagBuffer.values.length === this._bufferSize) {
-      flagBuffer.values.shift();
-    }
-
-    // Store the flag and its result in the buffer
-    flagBuffer.values.push({
-      flag: flagName,
-      result: flagResult,
-    });
+    insertFlagToScope(flagName, flagResult, this._bufferSize);
   }
 
   public observeOrganizationFlags({organization}: {organization: Organization}) {