diff --git a/src/assets/less/custom.less b/src/assets/less/custom.less
index e4b92e9213c..2975becff73 100644
--- a/src/assets/less/custom.less
+++ b/src/assets/less/custom.less
@@ -1438,8 +1438,8 @@ div input.input-type-slug {
 .flash-message {
 	display: inline-block;
 	opacity: 0;
-	-webkit-animation: fadeinout 2s linear forwards;
-	animation: fadeinout 2s linear forwards;
+	-webkit-animation: fadeinout 4s linear forwards;
+	animation: fadeinout 4s linear forwards;
 
 	&.error {
 		color: red;
diff --git a/src/organization/admin/settings/settings.component.ts b/src/organization/admin/settings/settings.component.ts
index ac91ab5b545..036da8e7bf1 100644
--- a/src/organization/admin/settings/settings.component.ts
+++ b/src/organization/admin/settings/settings.component.ts
@@ -81,6 +81,7 @@ export class SettingsComponent implements OnInit {
 
     clickUpdateOrganization(event){
         this.spinnerService.setState(true);
+        this.showUpdateMessage = false;
         this.updateOrganizationModel.slug = this.updateOrganizationModel.slug.toLowerCase();
         let r = this.service.updateOrganization(this.response.id, this.updateOrganizationModel);
         let self = this;
@@ -101,7 +102,7 @@ export class SettingsComponent implements OnInit {
                     this.spinnerService.setState(false);
                     this.refresh();
                 }
-                this.waitForUpdateMessage();
+                this.showUpdateMessage = true;
             },
             err => {
                 this.service.accountService.handleError(err);
@@ -110,13 +111,6 @@ export class SettingsComponent implements OnInit {
         );
     }
 
-    waitForUpdateMessage() {
-        this.showUpdateMessage = true;
-        setTimeout(() => {
-            this.showUpdateMessage = false;
-        }, 2000);
-    }
-
     logServerInputEmpty() {
         if(this.updateOrganizationModel.logserver_host == "" &&
             this.updateOrganizationModel.logserver_port == "" &&
diff --git a/src/system-management/system_setting/system_setting_info.component.html b/src/system-management/system_setting/system_setting_info.component.html
index 9b33017b3bf..34de98d3eaa 100644
--- a/src/system-management/system_setting/system_setting_info.component.html
+++ b/src/system-management/system_setting/system_setting_info.component.html
@@ -40,7 +40,7 @@ <h1 class="panel-title">Settings</h1>
 
                         <div class="form-group">
                             <button (click)="clickUpdateSystemSetting($event)" [disabled]="!updateSystemSettingModel.validate()||!settingChanged" class="btn btn-primary btn-blue btn-add-save btn-lg">Save</button>
-                            <div class="settings-update-msg" [class.settings-update-msg-fade-in]="showUpdateMessage">Settings have been updated!</div>
+                            <div class="flash-message" *ngIf="showUpdateMessage">Settings have been updated!</div>
                         </div>
                     </form>
                 </div>