diff --git a/src/components/Customer/BackupAddressForm/BackupAddressForm.jsx b/src/components/Customer/BackupAddressForm/BackupAddressForm.jsx
index 7507cdd1ac4..77b55ceaae9 100644
--- a/src/components/Customer/BackupAddressForm/BackupAddressForm.jsx
+++ b/src/components/Customer/BackupAddressForm/BackupAddressForm.jsx
@@ -61,7 +61,6 @@ const BackupAddressForm = ({ formFieldsName, initialValues, onSubmit, onBack })
diff --git a/src/components/Customer/EditContactInfoForm/EditContactInfoForm.jsx b/src/components/Customer/EditContactInfoForm/EditContactInfoForm.jsx
index 71a120d20af..26b82454f3b 100644
--- a/src/components/Customer/EditContactInfoForm/EditContactInfoForm.jsx
+++ b/src/components/Customer/EditContactInfoForm/EditContactInfoForm.jsx
@@ -101,7 +101,6 @@ const EditContactInfoForm = ({ initialValues, onSubmit, onCancel }) => {
@@ -117,7 +116,6 @@ const EditContactInfoForm = ({ initialValues, onSubmit, onCancel }) => {
diff --git a/src/components/Customer/ResidentialAddressForm/ResidentialAddressForm.jsx b/src/components/Customer/ResidentialAddressForm/ResidentialAddressForm.jsx
index bbd4a91583a..9ae92c124da 100644
--- a/src/components/Customer/ResidentialAddressForm/ResidentialAddressForm.jsx
+++ b/src/components/Customer/ResidentialAddressForm/ResidentialAddressForm.jsx
@@ -61,7 +61,6 @@ const ResidentialAddressForm = ({ formFieldsName, initialValues, onSubmit, onBac
labelHint="Required"
name={formFieldsName}
validators={validators}
- zipCityEnabled
zipCityError={isLookupErrorVisible}
handleZipCityChange={handleZipCityChange}
/>
diff --git a/src/components/form/AddressFields/AddressFields.jsx b/src/components/form/AddressFields/AddressFields.jsx
index 5fde6064a60..ca54a4a7f96 100644
--- a/src/components/form/AddressFields/AddressFields.jsx
+++ b/src/components/form/AddressFields/AddressFields.jsx
@@ -214,7 +214,7 @@ AddressFields.defaultProps = {
legend: '',
className: '',
render: (fields) => fields,
- zipCityEnabled: false,
+ zipCityEnabled: true,
zipCityError: false,
handleZipCityChange: null,
validators: {},
diff --git a/src/components/form/AddressFields/AddressFields.stories.jsx b/src/components/form/AddressFields/AddressFields.stories.jsx
index 33476511fd2..1110d878045 100644
--- a/src/components/form/AddressFields/AddressFields.stories.jsx
+++ b/src/components/form/AddressFields/AddressFields.stories.jsx
@@ -141,7 +141,7 @@ export const ZipCityAddress = () => (
>
{() => (
)}
diff --git a/src/components/form/AddressFields/AddressFields.test.jsx b/src/components/form/AddressFields/AddressFields.test.jsx
index f9fa324bc38..c950f0e3f27 100644
--- a/src/components/form/AddressFields/AddressFields.test.jsx
+++ b/src/components/form/AddressFields/AddressFields.test.jsx
@@ -143,12 +143,7 @@ describe('AddressFields component', () => {
const { getByLabelText, getByTestId } = render(
-
+
,
);
@@ -178,7 +173,6 @@ describe('AddressFields component', () => {