diff --git a/app/assets/javascripts/analytics/shared/utils.js b/app/assets/javascripts/analytics/shared/utils.js
index f5d13cf01aca201fab5bdc2fc1b46fc52f51ecdc..99a9f05cd5d705bec53c5ac40ea47d307d184c82 100644
--- a/app/assets/javascripts/analytics/shared/utils.js
+++ b/app/assets/javascripts/analytics/shared/utils.js
@@ -149,5 +149,5 @@ export const extractVSAFeaturesFromGON = () => ({
   cycleAnalyticsForProjects: Boolean(gon?.licensed_features?.cycleAnalyticsForProjects),
   groupLevelAnalyticsDashboard: Boolean(gon?.licensed_features?.groupLevelAnalyticsDashboard),
   // feature flags
-  vsaGroupAndProjectParity: Boolean(gon?.features?.vsaGroupAndProjectParity),
+  vsaStandaloneSettingsPage: Boolean(gon?.features?.vsaStandaloneSettingsPage),
 });
diff --git a/ee/app/assets/javascripts/analytics/cycle_analytics/store/actions/value_streams.js b/ee/app/assets/javascripts/analytics/cycle_analytics/store/actions/value_streams.js
index 21ecb81cf3860fa9732e4f64156a87fec0c17976..a31424fa65dd408c28885bdfe32ba30e9a810562 100644
--- a/ee/app/assets/javascripts/analytics/cycle_analytics/store/actions/value_streams.js
+++ b/ee/app/assets/javascripts/analytics/cycle_analytics/store/actions/value_streams.js
@@ -25,7 +25,7 @@ export const createValueStream = ({ commit, dispatch, getters }, data) => {
 };
 
 export const updateValueStream = (
-  { commit, dispatch, getters },
+  { state, commit, dispatch, getters },
   { id: valueStreamId, ...data },
 ) => {
   const { namespacePath } = getters;
@@ -33,7 +33,7 @@ export const updateValueStream = (
 
   return apiUpdateValueStream({ namespacePath, valueStreamId, data })
     .then(({ data: newValueStream }) => {
-      if (!gon.features?.vsaStandaloneSettingsPage) {
+      if (!state.features.vsaStandaloneSettingsPage) {
         commit(types.RECEIVE_UPDATE_VALUE_STREAM_SUCCESS, newValueStream);
         return dispatch('fetchCycleAnalyticsData');
       }
diff --git a/ee/spec/frontend/analytics/cycle_analytics/store/actions/value_streams_spec.js b/ee/spec/frontend/analytics/cycle_analytics/store/actions/value_streams_spec.js
index a93b56b8b5c61d8bc05aad37b1fdd52ff0c48b04..174e5b489f4794608671430e640cc362c1a94188 100644
--- a/ee/spec/frontend/analytics/cycle_analytics/store/actions/value_streams_spec.js
+++ b/ee/spec/frontend/analytics/cycle_analytics/store/actions/value_streams_spec.js
@@ -158,13 +158,9 @@ describe('Value Stream Analytics actions / value streams', () => {
     };
     const updateResp = { id: 'new value stream', is_custom: true, ...payload };
 
-    beforeEach(() => {
-      state = { currentGroup };
-    });
-
     describe('with no errors', () => {
       beforeEach(() => {
-        window.gon = { features: { vsaStandaloneSettingsPage: true } };
+        state = { currentGroup, features: { vsaStandaloneSettingsPage: true } };
         mock.onPut(endpoints.valueStreamData).replyOnce(HTTP_STATUS_OK, updateResp);
       });
 
@@ -177,7 +173,7 @@ describe('Value Stream Analytics actions / value streams', () => {
 
       describe('when `vsaStandaloneSettingsPage` feature flag is disabled', () => {
         beforeEach(() => {
-          window.gon = { features: { vsaStandaloneSettingsPage: false } };
+          state = { currentGroup, features: { vsaStandaloneSettingsPage: false } };
         });
 
         it(`commits the ${types.REQUEST_UPDATE_VALUE_STREAM} and ${types.RECEIVE_UPDATE_VALUE_STREAM_SUCCESS} mutations and dispatches the 'fetchCycleAnalyticsData' action`, () => {