diff --git a/application/src/main/java/org/thingsboard/server/service/mail/RefreshTokenExpCheckService.java b/application/src/main/java/org/thingsboard/server/service/mail/RefreshTokenExpCheckService.java
index 32fe4eb15c..7c7edf2164 100644
--- a/application/src/main/java/org/thingsboard/server/service/mail/RefreshTokenExpCheckService.java
+++ b/application/src/main/java/org/thingsboard/server/service/mail/RefreshTokenExpCheckService.java
@@ -54,23 +54,35 @@ public class RefreshTokenExpCheckService {
         AdminSettings settings = adminSettingsService.findAdminSettingsByKey(TenantId.SYS_TENANT_ID, "mail");
         if (settings != null && settings.getJsonValue().has("enableOauth2") && settings.getJsonValue().get("enableOauth2").asBoolean()) {
             JsonNode jsonValue = settings.getJsonValue();
-            if (OFFICE_365.name().equals(jsonValue.get("providerId").asText()) && jsonValue.has("refreshTokenExpires")) {
-                long expiresIn = jsonValue.get("refreshTokenExpires").longValue();
-                if ((expiresIn - System.currentTimeMillis()) < 604800000L) { //less than 7 days
-                    log.info("Trying to refresh refresh token.");
+            if (OFFICE_365.name().equals(jsonValue.get("providerId").asText()) && jsonValue.has("refreshToken")
+                    && jsonValue.has("refreshTokenExpires")) {
+                try {
+                    long expiresIn = jsonValue.get("refreshTokenExpires").longValue();
+                    long tokenLifeDuration = expiresIn - System.currentTimeMillis();
+                    if (tokenLifeDuration < 0) {
+                        ((ObjectNode) jsonValue).put("tokenGenerated", false);
+                        ((ObjectNode) jsonValue).remove("refreshToken");
+                        ((ObjectNode) jsonValue).remove("refreshTokenExpires");
 
-                    String clientId = jsonValue.get("clientId").asText();
-                    String clientSecret = jsonValue.get("clientSecret").asText();
-                    String refreshToken = jsonValue.get("refreshToken").asText();
-                    String tokenUri = jsonValue.get("tokenUri").asText();
+                        adminSettingsService.saveAdminSettings(TenantId.SYS_TENANT_ID, settings);
+                    } else if (tokenLifeDuration < 604800000L) { //less than 7 days
+                        log.info("Trying to refresh refresh token.");
 
-                    TokenResponse tokenResponse = new RefreshTokenRequest(new NetHttpTransport(), new GsonFactory(),
-                            new GenericUrl(tokenUri), refreshToken)
-                            .setClientAuthentication(new ClientParametersAuthentication(clientId, clientSecret))
-                            .execute();
-                    ((ObjectNode) jsonValue).put("refreshToken", tokenResponse.getRefreshToken());
-                    ((ObjectNode) jsonValue).put("refreshTokenExpires", Instant.now().plus(Duration.ofDays(AZURE_DEFAULT_REFRESH_TOKEN_LIFETIME_IN_DAYS)).toEpochMilli());
-                    adminSettingsService.saveAdminSettings(TenantId.SYS_TENANT_ID, settings);
+                        String clientId = jsonValue.get("clientId").asText();
+                        String clientSecret = jsonValue.get("clientSecret").asText();
+                        String refreshToken = jsonValue.get("refreshToken").asText();
+                        String tokenUri = jsonValue.get("tokenUri").asText();
+
+                        TokenResponse tokenResponse = new RefreshTokenRequest(new NetHttpTransport(), new GsonFactory(),
+                                new GenericUrl(tokenUri), refreshToken)
+                                .setClientAuthentication(new ClientParametersAuthentication(clientId, clientSecret))
+                                .execute();
+                        ((ObjectNode) jsonValue).put("refreshToken", tokenResponse.getRefreshToken());
+                        ((ObjectNode) jsonValue).put("refreshTokenExpires", Instant.now().plus(Duration.ofDays(AZURE_DEFAULT_REFRESH_TOKEN_LIFETIME_IN_DAYS)).toEpochMilli());
+                        adminSettingsService.saveAdminSettings(TenantId.SYS_TENANT_ID, settings);
+                    }
+                } catch (Exception e) {
+                    log.error("Error occurred while checking token", e);
                 }
             }
         }