diff --git a/application/src/main/java/org/thingsboard/server/service/apiusage/TenantApiUsageState.java b/application/src/main/java/org/thingsboard/server/service/apiusage/TenantApiUsageState.java
index a43afcd2c5..fd4ef96122 100644
--- a/application/src/main/java/org/thingsboard/server/service/apiusage/TenantApiUsageState.java
+++ b/application/src/main/java/org/thingsboard/server/service/apiusage/TenantApiUsageState.java
@@ -125,6 +125,10 @@ public class TenantApiUsageState {
                 return apiUsageState.getDbStorageState();
             case JS:
                 return apiUsageState.getJsExecState();
+            case EMAIL:
+                return apiUsageState.getEmailExecState();
+            case SMS:
+                return apiUsageState.getSmsExecState();
             default:
                 return ApiUsageStateValue.ENABLED;
         }
@@ -145,6 +149,12 @@ public class TenantApiUsageState {
             case JS:
                 apiUsageState.setJsExecState(value);
                 break;
+            case EMAIL:
+                apiUsageState.setEmailExecState(value);
+                break;
+            case SMS:
+                apiUsageState.setSmsExecState(value);
+                break;
         }
         return !currentValue.equals(value);
     }
diff --git a/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java b/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java
index 37910bddd1..7865321e67 100644
--- a/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java
+++ b/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java
@@ -304,6 +304,9 @@ public class DefaultMailService implements MailService {
                 return "invoke";
             case RE:
                 return "process";
+            case EMAIL:
+            case SMS:
+                return "send";
             default:
                 throw new RuntimeException("Not implemented!");
         }
@@ -319,6 +322,9 @@ public class DefaultMailService implements MailService {
                 return "invoked";
             case RE:
                 return "processed";
+            case EMAIL:
+            case SMS:
+                return "sent";
             default:
                 throw new RuntimeException("Not implemented!");
         }
@@ -337,6 +343,10 @@ public class DefaultMailService implements MailService {
                 return valueInM + " out of " + thresholdInM + " allowed JavaScript functions";
             case RE_EXEC_COUNT:
                 return valueInM + " out of " + thresholdInM + " allowed Rule Engine messages";
+            case EMAIL_EXEC_COUNT:
+                return valueInM + " out of " + thresholdInM + " allowed Email messages";
+            case SMS_EXEC_COUNT:
+                return valueInM + " out of " + thresholdInM + " allowed SMS messages";
             default:
                 throw new RuntimeException("Not implemented!");
         }
@@ -353,6 +363,10 @@ public class DefaultMailService implements MailService {
                 return "JavaScript functions " + getValueAsString(value) + " times";
             case RE_EXEC_COUNT:
                 return getValueAsString(value) + " Rule Engine messages";
+            case EMAIL_EXEC_COUNT:
+                return getValueAsString(value) + " Email messages";
+            case SMS_EXEC_COUNT:
+                return getValueAsString(value) + " SMS messages";
             default:
                 throw new RuntimeException("Not implemented!");
         }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/usagerecord/ApiUsageStateServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/usagerecord/ApiUsageStateServiceImpl.java
index 5fc1c293af..5677b0d73b 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/usagerecord/ApiUsageStateServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/usagerecord/ApiUsageStateServiceImpl.java
@@ -96,6 +96,10 @@ public class ApiUsageStateServiceImpl extends AbstractEntityService implements A
                 new StringDataEntry(ApiFeature.RE.getApiStateKey(), ApiUsageStateValue.ENABLED.name())));
         apiUsageStates.add(new BasicTsKvEntry(saved.getCreatedTime(),
                 new StringDataEntry(ApiFeature.JS.getApiStateKey(), ApiUsageStateValue.ENABLED.name())));
+        apiUsageStates.add(new BasicTsKvEntry(saved.getCreatedTime(),
+                new StringDataEntry(ApiFeature.EMAIL.getApiStateKey(), ApiUsageStateValue.ENABLED.name())));
+        apiUsageStates.add(new BasicTsKvEntry(saved.getCreatedTime(),
+                new StringDataEntry(ApiFeature.SMS.getApiStateKey(), ApiUsageStateValue.ENABLED.name())));
         tsService.save(tenantId, saved.getId(), apiUsageStates, 0L);
 
         List<TsKvEntry> profileThresholds = new ArrayList<>();