diff --git a/web/packages/teleport/src/services/storageService/storageService.test.ts b/web/packages/teleport/src/services/storageService/storageService.test.ts
index 918d7ab8f5d91..51a7a8c8bf414 100644
--- a/web/packages/teleport/src/services/storageService/storageService.test.ts
+++ b/web/packages/teleport/src/services/storageService/storageService.test.ts
@@ -57,4 +57,13 @@ describe('localStorage', () => {
     ls.clear();
     expect(localStorage).toHaveLength(0);
   });
+
+  test('parses JSON configuration values', () => {
+    localStorage.setItem('key1', '{"foo": "bar"}');
+    localStorage.setItem('key2', 'true');
+
+    expect(ls.getParsedJSONValue('key1', null)).toEqual({ foo: 'bar' });
+    expect(ls.getParsedJSONValue('key2', null)).toBe(true);
+    expect(ls.getParsedJSONValue('not-a-key', 'default')).toBe('default');
+  });
 });
diff --git a/web/packages/teleport/src/services/storageService/storageService.ts b/web/packages/teleport/src/services/storageService/storageService.ts
index 090441b1ba6eb..dc920b20ceb70 100644
--- a/web/packages/teleport/src/services/storageService/storageService.ts
+++ b/web/packages/teleport/src/services/storageService/storageService.ts
@@ -43,6 +43,7 @@ const KEEP_LOCALSTORAGE_KEYS_ON_LOGOUT = [
   KeysEnum.SHOW_ASSIST_POPUP,
   KeysEnum.USER_PREFERENCES,
   KeysEnum.RECOMMEND_FEATURE,
+  KeysEnum.NEW_ADD_AUTH_DEVICE_DIALOG,
 ];
 
 export const storageService = {
@@ -62,17 +63,20 @@ export const storageService = {
     window.removeEventListener('storage', fn);
   },
 
+  getParsedJSONValue<T>(key: string, defaultValue: T): T {
+    const item = window.localStorage.getItem(key);
+    if (item) {
+      return JSON.parse(item);
+    }
+    return defaultValue;
+  },
+
   setBearerToken(token: BearerToken) {
     window.localStorage.setItem(KeysEnum.TOKEN, JSON.stringify(token));
   },
 
   getBearerToken(): BearerToken {
-    const item = window.localStorage.getItem(KeysEnum.TOKEN);
-    if (item) {
-      return JSON.parse(item);
-    }
-
-    return null;
+    return this.getParsedJSONValue(KeysEnum.TOKEN, null);
   },
 
   getAccessToken() {
@@ -103,11 +107,7 @@ export const storageService = {
   },
 
   getOnboardDiscover(): OnboardDiscover {
-    const item = window.localStorage.getItem(KeysEnum.DISCOVER);
-    if (item) {
-      return JSON.parse(item);
-    }
-    return null;
+    return this.getParsedJSONValue(KeysEnum.DISCOVER, null);
   },
 
   getUserPreferences(): UserPreferences {
@@ -142,11 +142,7 @@ export const storageService = {
   },
 
   getOnboardSurvey(): LocalStorageSurvey {
-    const survey = window.localStorage.getItem(KeysEnum.ONBOARD_SURVEY);
-    if (survey) {
-      return JSON.parse(survey);
-    }
-    return null;
+    return this.getParsedJSONValue(KeysEnum.ONBOARD_SURVEY, null);
   },
 
   setOnboardSurvey(survey: LocalStorageSurvey) {
@@ -160,11 +156,7 @@ export const storageService = {
   },
 
   getCloudUserInvites(): CloudUserInvites {
-    const invites = window.localStorage.getItem(KeysEnum.CLOUD_USER_INVITES);
-    if (invites) {
-      return JSON.parse(invites);
-    }
-    return null;
+    return this.getParsedJSONValue(KeysEnum.CLOUD_USER_INVITES, null);
   },
 
   setCloudUserInvites(invites: CloudUserInvites) {
@@ -238,37 +230,22 @@ export const storageService = {
   },
 
   getFeatureRecommendationStatus(): RecommendFeature {
-    const item = window.localStorage.getItem(KeysEnum.RECOMMEND_FEATURE);
-    if (item) {
-      return JSON.parse(item);
-    }
-    return null;
+    return this.getParsedJSONValue(KeysEnum.RECOMMEND_FEATURE, null);
   },
 
   getAccessGraphEnabled(): boolean {
-    const item = window.localStorage.getItem(KeysEnum.ACCESS_GRAPH_ENABLED);
-    if (item) {
-      return JSON.parse(item);
-    }
-    return false;
+    return this.getParsedJSONValue(KeysEnum.ACCESS_GRAPH_ENABLED, false);
   },
 
   getAccessGraphSQLEnabled(): boolean {
-    const item = window.localStorage.getItem(KeysEnum.ACCESS_GRAPH_SQL_ENABLED);
-    if (item) {
-      return JSON.parse(item);
-    }
-    return false;
+    return this.getParsedJSONValue(KeysEnum.ACCESS_GRAPH_SQL_ENABLED, false);
   },
 
   getExternalAuditStorageCtaDisabled(): boolean {
-    const item = window.localStorage.getItem(
-      KeysEnum.EXTERNAL_AUDIT_STORAGE_CTA_DISABLED
+    return this.getParsedJSONValue(
+      KeysEnum.EXTERNAL_AUDIT_STORAGE_CTA_DISABLED,
+      false
     );
-    if (item) {
-      return JSON.parse(item);
-    }
-    return false;
   },
 
   disableExternalAuditStorageCta(): void {
@@ -277,4 +254,8 @@ export const storageService = {
       JSON.stringify(true)
     );
   },
+
+  isNewAddAuthDeviceDialogEnabled(): boolean {
+    return this.getParsedJSONValue(KeysEnum.NEW_ADD_AUTH_DEVICE_DIALOG, false);
+  },
 };
diff --git a/web/packages/teleport/src/services/storageService/types.ts b/web/packages/teleport/src/services/storageService/types.ts
index 1faf82b6e66d9..8260c51e0ace9 100644
--- a/web/packages/teleport/src/services/storageService/types.ts
+++ b/web/packages/teleport/src/services/storageService/types.ts
@@ -35,6 +35,10 @@ export const KeysEnum = {
   ACCESS_GRAPH_SQL_ENABLED: 'grv_teleport_access_graph_sql_enabled',
   EXTERNAL_AUDIT_STORAGE_CTA_DISABLED:
     'grv_teleport_external_audit_storage_disabled',
+
+  // TODO(bl-nero): Remove this option once
+  // https://github.com/gravitational/teleport/issues/37616 is resolved.
+  NEW_ADD_AUTH_DEVICE_DIALOG: 'grv_new_add_auth_device_dialog',
 };
 
 // SurveyRequest is the request for sending data to the back end