diff --git a/frontend/web/components/pages/EnvironmentSettingsPage.js b/frontend/web/components/pages/EnvironmentSettingsPage.js
index 582b586125aa..d3125965a864 100644
--- a/frontend/web/components/pages/EnvironmentSettingsPage.js
+++ b/frontend/web/components/pages/EnvironmentSettingsPage.js
@@ -24,6 +24,7 @@ import { enableFeatureVersioning } from 'common/services/useEnableFeatureVersion
 import AddMetadataToEntity from 'components/metadata/AddMetadataToEntity'
 import { getSupportedContentType } from 'common/services/useSupportedContentType'
 import EnvironmentVersioningListener from 'components/EnvironmentVersioningListener'
+import Format from 'common/utils/format'
 
 const showDisabledFlagOptions = [
   { label: 'Inherit from Project', value: null },
@@ -228,15 +229,18 @@ const EnvironmentSettingsPage = class extends Component {
     )
   }
 
-  confirmToggle = (title, description, feature) => {
+  confirmToggle = (title, environmentProperty, environmentPropertyValue) => {
     openModal(
       title,
       <ConfirmToggleEnvFeature
-        description={`${description} Are you sure that you want to change this value?`}
-        feature={feature}
-        featureValue={this.state[feature]}
-        onToggleChange={(value) => {
-          this.setState({ [feature]: value }, this.saveEnv)
+        description={'Are you sure that you want to change this value?'}
+        feature={Format.enumeration.get(environmentProperty)}
+        featureValue={environmentPropertyValue}
+        onToggleChange={() => {
+          this.setState(
+            { [environmentProperty]: !environmentPropertyValue },
+            this.saveEnv,
+          )
           closeModal()
         }}
       />,
@@ -484,7 +488,7 @@ const EnvironmentSettingsPage = class extends Component {
                               checked={hide_sensitive_data}
                               onChange={(v) => {
                                 this.confirmToggle(
-                                  'The data returned from the API will change and could break your existing code. Are you sure that you want to change this value?',
+                                  'Confirm Environment Setting',
                                   'hide_sensitive_data',
                                   hide_sensitive_data,
                                 )