diff --git a/client-react/src/pages/app/app-settings/AppSettingsFormData.ts b/client-react/src/pages/app/app-settings/AppSettingsFormData.ts
index a28219e4dc..65ad6696cf 100644
--- a/client-react/src/pages/app/app-settings/AppSettingsFormData.ts
+++ b/client-react/src/pages/app/app-settings/AppSettingsFormData.ts
@@ -190,13 +190,19 @@ export const convertFormToState = (
   initialValues: AppSettingsFormValues,
   oldSlotConfigNames: ArmObj<SlotConfigNames>
 ): ApiSetupReturn => {
-  const site = { ...values.site };
-  const { clientCertMode, ClientCertEnabled } = getClientCertValues(
+  const { clientCertMode, clientCertEnabled } = getClientCertValues(
     initialValues.site.properties.clientCertMode,
     values.site.properties.clientCertMode
   );
-  site.properties.clientCertMode = clientCertMode;
-  site.properties.clientCertEnabled = ClientCertEnabled;
+
+  const site = {
+    ...values.site,
+    properties: {
+      ...values.site.properties,
+      clientCertMode: clientCertMode,
+      clientCertEnabled: clientCertEnabled,
+    },
+  };
 
   const slotConfigNames = getStickySettings(values.appSettings, values.connectionStrings, values.azureStorageMounts, oldSlotConfigNames);
   const slotConfigNamesModified = isSlotConfigNamesModified(oldSlotConfigNames, slotConfigNames);
@@ -268,7 +274,7 @@ export function getClientCertValues(initialClientCertMode: string, currentClient
 
   return {
     clientCertMode: isClientCertModeIgnore ? initialClientCertMode : currentClientCertMode,
-    ClientCertEnabled: !isClientCertModeIgnore,
+    clientCertEnabled: !isClientCertModeIgnore,
   };
 }
 
diff --git a/client-react/src/pages/app/app-settings/GeneralSettings/ClientCert/ClientCert.tsx b/client-react/src/pages/app/app-settings/GeneralSettings/ClientCert/ClientCert.tsx
index bf931a15e7..c0f5a01f2a 100644
--- a/client-react/src/pages/app/app-settings/GeneralSettings/ClientCert/ClientCert.tsx
+++ b/client-react/src/pages/app/app-settings/GeneralSettings/ClientCert/ClientCert.tsx
@@ -4,7 +4,7 @@ import { Field, FormikProps } from 'formik';
 import { useTranslation } from 'react-i18next';
 import { PermissionsContext, SiteContext } from '../../Contexts';
 import TextField from '../../../../../components/form-controls/TextField';
-import { Stack, PanelType, IChoiceGroupOption, MessageBarType } from '@fluentui/react';
+import { Stack, PanelType, MessageBarType } from '@fluentui/react';
 import IconButton from '../../../../../components/IconButton/IconButton';
 import EditClientExclusionPaths from './EditClientExclusionPaths';
 import { AppSettingsFormValues } from '../../AppSettings.types';
diff --git a/client-react/src/pages/app/app-settings/GeneralSettings/Platform.tsx b/client-react/src/pages/app/app-settings/GeneralSettings/Platform.tsx
index 810dd23f97..0fa081c821 100644
--- a/client-react/src/pages/app/app-settings/GeneralSettings/Platform.tsx
+++ b/client-react/src/pages/app/app-settings/GeneralSettings/Platform.tsx
@@ -8,7 +8,7 @@ import { ScenarioService } from '../../../../utils/scenario-checker/scenario.ser
 import { AppSettingsFormValues } from '../AppSettings.types';
 import { PermissionsContext, SiteContext } from '../Contexts';
 import { Links } from '../../../../utils/FwLinks';
-import { ClientCertMode, IPMode, MinTlsVersion, SslState, VnetPrivatePortsCount } from '../../../../models/site/site';
+import { IPMode, MinTlsVersion, SslState, VnetPrivatePortsCount } from '../../../../models/site/site';
 import CustomBanner from '../../../../components/CustomBanner/CustomBanner';
 import { IDropdownOption, MessageBar, MessageBarType, mergeStyles } from '@fluentui/react';
 import { CommonConstants, ScmHosts } from '../../../../utils/CommonConstants';