diff --git a/src/shared/components/Settings/Profile/BasicInfo/index.jsx b/src/shared/components/Settings/Profile/BasicInfo/index.jsx
index 15e6d4e94e..a7212a0d72 100644
--- a/src/shared/components/Settings/Profile/BasicInfo/index.jsx
+++ b/src/shared/components/Settings/Profile/BasicInfo/index.jsx
@@ -73,6 +73,7 @@ export default class BasicInfo extends ConsentComponent {
         competitionCountryCode: null,
         photoURL: '',
         tracks: [],
+        isSaving: false,
       },
     };
   }
@@ -171,8 +172,10 @@ export default class BasicInfo extends ConsentComponent {
    */
   onHandleSaveBasicInfo(e) {
     e.preventDefault();
+    this.setState({ isSaving: true });
     const { newBasicInfo } = this.state;
     if (this.onCheckFormValue(newBasicInfo)) {
+      this.setState({ isSaving: false });
       return;
     }
     this.showConsent(this.onSaveBasicInfo.bind(this));
@@ -233,6 +236,8 @@ export default class BasicInfo extends ConsentComponent {
         await updateUserTrait(handle, 'personalization', [personalizationData], tokenV3);
       }
     }
+
+    this.setState({ isSaving: false });
   }
 
   onUpdateSelect(option) {
@@ -458,6 +463,7 @@ export default class BasicInfo extends ConsentComponent {
       newBasicInfo,
       formInvalid,
       errorMessage,
+      isSaving,
     } = this.state;
 
     return (
@@ -911,7 +917,7 @@ export default class BasicInfo extends ConsentComponent {
         <div styleName="button-save">
           <PrimaryButton
             styleName="white-label"
-            disabled={false}
+            disabled={isSaving}
             onClick={this.onHandleSaveBasicInfo}
           >
             {