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 5652f7dd71..d44715cc63 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
@@ -36,7 +36,6 @@ import { RateLimitsType } from '@shared/models/rate-limits.models';
 export class DefaultTenantProfileConfigurationComponent implements ControlValueAccessor, OnInit {
 
   defaultTenantProfileConfigurationFormGroup: FormGroup;
-  rateLimitsPattern = '([1-9]\\d*:[1-9]\\d*)(,[1-9]\\d*:[1-9]\\d*)*';
 
   private requiredValue: boolean;
   get required(): boolean {
@@ -65,14 +64,14 @@ export class DefaultTenantProfileConfigurationComponent implements ControlValueA
       maxRuleChains: [null, [Validators.required, Validators.min(0)]],
       maxResourcesInBytes: [null, [Validators.required, Validators.min(0)]],
       maxOtaPackagesInBytes: [null, [Validators.required, Validators.min(0)]],
-      transportTenantMsgRateLimit: [null, [Validators.pattern(this.rateLimitsPattern)]],
-      transportTenantTelemetryMsgRateLimit: [null, [Validators.pattern(this.rateLimitsPattern)]],
-      transportTenantTelemetryDataPointsRateLimit: [null, [Validators.pattern(this.rateLimitsPattern)]],
-      transportDeviceMsgRateLimit: [null, [Validators.pattern(this.rateLimitsPattern)]],
-      transportDeviceTelemetryMsgRateLimit: [null, [Validators.pattern(this.rateLimitsPattern)]],
-      transportDeviceTelemetryDataPointsRateLimit: [null, [Validators.pattern(this.rateLimitsPattern)]],
-      tenantEntityExportRateLimit: [null, [Validators.pattern(this.rateLimitsPattern)]],
-      tenantEntityImportRateLimit: [null, [Validators.pattern(this.rateLimitsPattern)]],
+      transportTenantMsgRateLimit: [null, []],
+      transportTenantTelemetryMsgRateLimit: [null, []],
+      transportTenantTelemetryDataPointsRateLimit: [null, []],
+      transportDeviceMsgRateLimit: [null, []],
+      transportDeviceTelemetryMsgRateLimit: [null, []],
+      transportDeviceTelemetryDataPointsRateLimit: [null, []],
+      tenantEntityExportRateLimit: [null, []],
+      tenantEntityImportRateLimit: [null, []],
       maxTransportMessages: [null, [Validators.required, Validators.min(0)]],
       maxTransportDataPoints: [null, [Validators.required, Validators.min(0)]],
       maxREExecutions: [null, [Validators.required, Validators.min(0)]],
@@ -85,8 +84,8 @@ export class DefaultTenantProfileConfigurationComponent implements ControlValueA
       defaultStorageTtlDays: [null, [Validators.required, Validators.min(0)]],
       alarmsTtlDays: [null, [Validators.required, Validators.min(0)]],
       rpcTtlDays: [null, [Validators.required, Validators.min(0)]],
-      tenantServerRestLimitsConfiguration: [null, [Validators.pattern(this.rateLimitsPattern)]],
-      customerServerRestLimitsConfiguration: [null, [Validators.pattern(this.rateLimitsPattern)]],
+      tenantServerRestLimitsConfiguration: [null, []],
+      customerServerRestLimitsConfiguration: [null, []],
       maxWsSessionsPerTenant: [null, [Validators.min(0)]],
       maxWsSessionsPerCustomer: [null, [Validators.min(0)]],
       maxWsSessionsPerRegularUser: [null, [Validators.min(0)]],
@@ -96,8 +95,8 @@ export class DefaultTenantProfileConfigurationComponent implements ControlValueA
       maxWsSubscriptionsPerCustomer: [null, [Validators.min(0)]],
       maxWsSubscriptionsPerRegularUser: [null, [Validators.min(0)]],
       maxWsSubscriptionsPerPublicUser: [null, [Validators.min(0)]],
-      wsUpdatesPerSessionRateLimit: [null, [Validators.pattern(this.rateLimitsPattern)]],
-      cassandraQueryTenantRateLimitsConfiguration: [null, [Validators.pattern(this.rateLimitsPattern)]]
+      wsUpdatesPerSessionRateLimit: [null, []],
+      cassandraQueryTenantRateLimitsConfiguration: [null, []]
     });
     this.defaultTenantProfileConfigurationFormGroup.valueChanges.subscribe(() => {
       this.updateModel();
diff --git a/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits-list.component.html b/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits-list.component.html
index 7d1f3e4561..768b351070 100644
--- a/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits-list.component.html
+++ b/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits-list.component.html
@@ -47,6 +47,7 @@
               class="tb-rate-limits-button"
               *ngIf="!rateLimitsFormArray().disabled"
               (click)="removeRateLimits($index)"
+              [disabled]="disabled"
               [matTooltip]="'tenant-profile.rate-limits.remove-limit' | translate" matTooltipPosition="above">
         <mat-icon>remove_circle_outline</mat-icon>
       </button>
@@ -55,6 +56,7 @@
   <div>
     <button mat-raised-button color="primary" *ngIf="!rateLimitsFormArray().disabled"
             (click)="addRateLimits()"
+            [disabled]="disabled"
             [matTooltip]="'tenant-profile.rate-limits.add-limit' | translate" matTooltipPosition="above">
       <span translate>tenant-profile.rate-limits.add-limit</span>
     </button>