diff --git a/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html b/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html
index ae9fd8ea9c..fa0029b46f 100644
--- a/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html
+++ b/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html
@@ -160,6 +160,30 @@
       {{ 'tenant-profile.max-rule-node-executions-per-message-range' | translate}}
     </mat-error>
   </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.max-emails</mat-label>
+    <input matInput required min="0" step="1"
+           formControlName="maxEmails"
+           type="number">
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxEmails').hasError('required')">
+      {{ 'tenant-profile.max-emails-required' | translate}}
+    </mat-error>
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxEmails').hasError('min')">
+      {{ 'tenant-profile.max-emails-range' | translate}}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.max-sms</mat-label>
+    <input matInput required min="0" step="1"
+           formControlName="maxSms"
+           type="number">
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxSms').hasError('required')">
+      {{ 'tenant-profile.max-sms-required' | translate}}
+    </mat-error>
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxSms').hasError('min')">
+      {{ 'tenant-profile.max-sms-range' | translate}}
+    </mat-error>
+  </mat-form-field>
   <mat-form-field class="mat-block">
     <mat-label translate>tenant-profile.transport-tenant-msg-rate-limit</mat-label>
     <input matInput formControlName="transportTenantMsgRateLimit">
diff --git a/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts b/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts
index e88537736b..641f14d52c 100644
--- a/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts
+++ b/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts
@@ -70,7 +70,9 @@ export class DefaultTenantProfileConfigurationComponent implements ControlValueA
       maxREExecutions: [null, [Validators.required, Validators.min(0)]],
       maxJSExecutions: [null, [Validators.required, Validators.min(0)]],
       maxDPStorageDays: [null, [Validators.required, Validators.min(0)]],
-      maxRuleNodeExecutionsPerMessage: [null, [Validators.required, Validators.min(0)]]
+      maxRuleNodeExecutionsPerMessage: [null, [Validators.required, Validators.min(0)]],
+      maxEmails: [null, [Validators.required, Validators.min(0)]],
+      maxSms: [null, [Validators.required, Validators.min(0)]]
     });
     this.defaultTenantProfileConfigurationFormGroup.valueChanges.subscribe(() => {
       this.updateModel();
diff --git a/ui-ngx/src/app/shared/models/tenant.model.ts b/ui-ngx/src/app/shared/models/tenant.model.ts
index ce22c27fac..f682bf1d39 100644
--- a/ui-ngx/src/app/shared/models/tenant.model.ts
+++ b/ui-ngx/src/app/shared/models/tenant.model.ts
@@ -44,6 +44,8 @@ export interface DefaultTenantProfileConfiguration {
   maxJSExecutions: number;
   maxDPStorageDays: number;
   maxRuleNodeExecutionsPerMessage: number;
+  maxEmails: number;
+  maxSms: number;
 }
 
 export type TenantProfileConfigurations = DefaultTenantProfileConfiguration;
@@ -69,7 +71,9 @@ export function createTenantProfileConfiguration(type: TenantProfileType): Tenan
           maxREExecutions: 0,
           maxJSExecutions: 0,
           maxDPStorageDays: 0,
-          maxRuleNodeExecutionsPerMessage: 0
+          maxRuleNodeExecutionsPerMessage: 0,
+          maxEmails: 0,
+          maxSms: 0
         };
         configuration = {...defaultConfiguration, type: TenantProfileType.DEFAULT};
         break;
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index ca3717eeff..41243f885e 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -2017,7 +2017,13 @@
         "max-d-p-storage-days-range": "Minimum number of data points storage days can't be negative",
         "max-rule-node-executions-per-message": "Maximum number of rule node executions per message (0 - unlimited)",
         "max-rule-node-executions-per-message-required": "Maximum number of rule node executions per message is required.",
-        "max-rule-node-executions-per-message-range": "Minimum number of rule node executions per message can't be negative"
+        "max-rule-node-executions-per-message-range": "Minimum number of rule node executions per message can't be negative",
+        "max-emails": "Maximum number of emails sent (0 - unlimited)",
+        "max-emails-required": "Maximum number of emails sent is required.",
+        "max-emails-range": "Maximum number of emails sent can't be negative",
+        "max-sms": "Maximum number of SMS sent (0 - unlimited)",
+        "max-sms-required": "Maximum number of SMS sent is required.",
+        "max-sms-range": "Maximum number of SMS sent can't be negative"
     },
     "timeinterval": {
         "seconds-interval": "{ seconds, plural, 1 {1 second} other {# seconds} }",