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 2e5d698121..21d2fe49af 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
@@ -76,6 +76,22 @@
         <mat-hint></mat-hint>
       </mat-form-field>
     </div>
+    <div class="fields-element flex flex-1 flex-row xs:flex-col gt-xs:gap-4">
+      <mat-form-field class="mat-block flex-1" appearance="fill" subscriptSizing="dynamic">
+        <mat-label translate>tenant-profile.maximum-debug-duration-min</mat-label>
+        <input matInput required min="0" step="1"
+               formControlName="maxDebugModeDurationMinutes"
+               type="number">
+        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxDebugModeDurationMinutes').hasError('required')">
+          {{ 'tenant-profile.maximum-debug-duration-min-range' | translate}}
+        </mat-error>
+        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxDebugModeDurationMinutes').hasError('min')">
+          {{ 'tenant-profile.maximum-debug-duration-min-required' | translate}}
+        </mat-error>
+        <mat-hint></mat-hint>
+      </mat-form-field>
+      <div class="flex-1"></div>
+    </div>
     <mat-expansion-panel class="configuration-panel">
       <mat-expansion-panel-header>
         <mat-panel-description class="flex items-stretch justify-end" translate>
@@ -147,22 +163,6 @@
         <mat-hint></mat-hint>
       </mat-form-field>
     </div>
-    <div class="fields-element flex flex-1 flex-row xs:flex-col gt-xs:gap-4">
-      <mat-form-field class="mat-block flex-1" appearance="fill" subscriptSizing="dynamic">
-        <mat-label translate>tenant-profile.maximum-rule-node-debug-duration-min</mat-label>
-        <input matInput required min="0" step="1"
-               formControlName="maxRuleNodeDebugDurationMinutes"
-               type="number">
-        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxRuleNodeDebugDurationMinutes').hasError('required')">
-          {{ 'tenant-profile.maximum-rule-node-debug-duration-min-range' | translate}}
-        </mat-error>
-        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxRuleNodeDebugDurationMinutes').hasError('min')">
-          {{ 'tenant-profile.maximum-rule-node-debug-duration-min-required' | translate}}
-        </mat-error>
-        <mat-hint></mat-hint>
-      </mat-form-field>
-      <div class="flex-1"></div>
-    </div>
     <mat-expansion-panel class="configuration-panel">
       <mat-expansion-panel-header>
         <mat-panel-description class="flex items-stretch justify-end" translate>
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 7aca5ed0e2..f9f6fc190e 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -4308,9 +4308,9 @@
         "maximum-ota-packages-sum-data-size": "Maximum total size of OTA package files (bytes)",
         "maximum-ota-package-sum-data-size-required": "Maximum total size of OTA package files is required.",
         "maximum-ota-package-sum-data-size-range": "Maximum total size of OTA package files can't be negative",
-        "maximum-rule-node-debug-duration-min": "Maximum rule node debug duration (min)",
-        "maximum-rule-node-debug-duration-min-required": "Maximum rule node debug duration is required.",
-        "maximum-rule-node-debug-duration-min-range": "Maximum rule node debug duration can't be negative",
+        "maximum-debug-duration-min": "Maximum debug duration (min)",
+        "maximum-debug-duration-min-required": "Maximum debug duration is required.",
+        "maximum-debug-duration-min-range": "Maximum debug duration can't be negative",
         "rest-requests-for-tenant": "REST requests for tenant",
         "transport-tenant-telemetry-msg-rate-limit": "Transport tenant telemetry messages",
         "transport-tenant-telemetry-data-points-rate-limit": "Transport tenant telemetry data points",