diff --git a/config/utils.go b/config/utils.go
index 78a16d054f..a1a552579d 100644
--- a/config/utils.go
+++ b/config/utils.go
@@ -53,6 +53,10 @@ func desanitize(actual, target *model.Config) {
 	for i := range target.SqlSettings.DataSourceSearchReplicas {
 		target.SqlSettings.DataSourceSearchReplicas[i] = actual.SqlSettings.DataSourceSearchReplicas[i]
 	}
+
+	if *target.MessageExportSettings.GlobalRelaySettings.SmtpPassword == model.FAKE_SETTING {
+		*target.MessageExportSettings.GlobalRelaySettings.SmtpPassword = *actual.MessageExportSettings.GlobalRelaySettings.SmtpPassword
+	}
 }
 
 // fixConfig patches invalid or missing data in the configuration, returning true if changed.
diff --git a/model/config.go b/model/config.go
index 183c639e33..f73c601959 100644
--- a/model/config.go
+++ b/model/config.go
@@ -3487,4 +3487,8 @@ func (o *Config) Sanitize() {
 	for i := range o.SqlSettings.DataSourceSearchReplicas {
 		o.SqlSettings.DataSourceSearchReplicas[i] = FAKE_SETTING
 	}
+
+	if o.MessageExportSettings.GlobalRelaySettings.SmtpPassword != nil && len(*o.MessageExportSettings.GlobalRelaySettings.SmtpPassword) > 0 {
+		*o.MessageExportSettings.GlobalRelaySettings.SmtpPassword = FAKE_SETTING
+	}
 }