diff --git a/application/src/main/java/org/thingsboard/server/service/system/DefaultSystemInfoService.java b/application/src/main/java/org/thingsboard/server/service/system/DefaultSystemInfoService.java
index 245cd72d6e..cce38cfd18 100644
--- a/application/src/main/java/org/thingsboard/server/service/system/DefaultSystemInfoService.java
+++ b/application/src/main/java/org/thingsboard/server/service/system/DefaultSystemInfoService.java
@@ -146,7 +146,7 @@ public class DefaultSystemInfoService extends TbApplicationEventListener<Partiti
         AdminSettings mailSettings = adminSettingsService.findAdminSettingsByKey(TenantId.SYS_TENANT_ID, "mail");
         if (mailSettings != null) {
             JsonNode mailFrom = mailSettings.getJsonValue().get("mailFrom");
-            return StringUtils.isNotEmpty(mailFrom.asText());
+            return StringUtils.isNotEmpty(mailFrom.asText()) && !"ThingsBoard <sysadmin@localhost.localdomain>".equalsIgnoreCase(mailFrom.asText());
         }
         return false;
     }