diff --git a/.circleci/config.yml b/.circleci/config.yml
index fdc185e38f..c76c230d2e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -343,6 +343,7 @@ workflows:
             branches:
               only:
                 - develop
+                - fix/settings-save-fail
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global      
@@ -372,6 +373,7 @@ workflows:
               only:
                 - develop
                 - features/mm-dashboard
+                - fix/settings-save-fail
       # Production builds are exectuted 
       # when PR is merged to the master
       # Don't change anything in this configuration
diff --git a/src/shared/components/Settings/Profile/BasicInfo/index.jsx b/src/shared/components/Settings/Profile/BasicInfo/index.jsx
index 1bec3d5d08..3933293bb1 100644
--- a/src/shared/components/Settings/Profile/BasicInfo/index.jsx
+++ b/src/shared/components/Settings/Profile/BasicInfo/index.jsx
@@ -206,6 +206,7 @@ export default class BasicInfo extends ConsentComponent {
       newBasicInfo.tshirtSize = null;
     }
 
+    newProfileInfo.addresses[0] = _.omit(newProfileInfo.addresses[0], ['createdAt', 'updatedBy', 'createdBy', 'updatedAt']);
     _.forEach(newProfileInfo.addresses[0], (value, key) => {
       newProfileInfo.addresses[0][key] = _.trim(value);
     });
@@ -240,6 +241,10 @@ export default class BasicInfo extends ConsentComponent {
       }
     }
 
+    if (newProfileInfo.homeCountryCode == null) {
+      delete newProfileInfo.homeCountryCode;
+    }
+
     const updateProfileData = {
       ...newProfileInfo,
     };