diff --git a/ui-ngx/src/app/modules/home/components/entity/debug/entity-debug-settings-panel.component.html b/ui-ngx/src/app/modules/home/components/entity/debug/entity-debug-settings-panel.component.html
index cf8c0ae14d..4a9bc57d8d 100644
--- a/ui-ngx/src/app/modules/home/components/entity/debug/entity-debug-settings-panel.component.html
+++ b/ui-ngx/src/app/modules/home/components/entity/debug/entity-debug-settings-panel.component.html
@@ -15,17 +15,15 @@
     limitations under the License.
 
 -->
-<div class="flex max-w-sm flex-col gap-3 p-2">
+<div class="flex w-96 flex-col gap-3 p-2">
   <div class="tb-form-panel-title" translate>debug-settings.label</div>
-  <div class="hint-container">
-    <div class="tb-form-hint tb-primary-fill tb-flex center">
-      @if (debugLimitsConfiguration) {
+  @if (debugLimitsConfiguration) {
+    <div class="hint-container">
+      <div class="tb-form-hint tb-primary-fill tb-flex center">
         {{ 'debug-settings.hint.main-limited' | translate: { entity: entityLabel ?? ('debug-settings.entity' | translate), msg: maxMessagesCount, time: (maxTimeFrameDuration | milliSecondsToTimeString: true : true) } }}
-      } @else {
-        {{ 'debug-settings.hint.main' | translate }}
-      }
+      </div>
     </div>
-  </div>
+  }
   <div class="flex flex-col gap-3">
     <mat-slide-toggle class="mat-slide" [formControl]="onFailuresControl">
       <div tb-hint-tooltip-icon="{{ 'debug-settings.hint.on-failure' | translate }}">
@@ -33,12 +31,12 @@
       </div>
     </mat-slide-toggle>
     <div class="align-center flex justify-between">
-      <mat-slide-toggle class="mat-slide" [formControl]="debugAllControl">
+      <mat-slide-toggle class="mat-slide" [formControl]="debugAllControl" (change)="debugAllControl.markAsTouched()">
         <div tb-hint-tooltip-icon="{{ 'debug-settings.hint.all-messages' | translate }}">
-          {{ 'debug-settings.all-messages' | translate: { time: (isDebugAllActive$ | async) && !allEnabled ? (allEnabledUntil | durationLeft) : (maxDebugModeDuration | milliSecondsToTimeString: true : true) } }}
+          {{ 'debug-settings.all-messages' | translate: { time: (isDebugAllActive$ | async) && !allEnabled && debugAllControl.untouched ? (allEnabledUntil | durationLeft) : (maxDebugModeDuration | milliSecondsToTimeString: true : true) } }}
         </div>
       </mat-slide-toggle>
-      <button mat-icon-button *ngIf="(isDebugAllActive$ | async) && !allEnabled"
+      <button mat-icon-button *ngIf="(isDebugAllActive$ | async) && !allEnabled && debugAllControl.untouched"
               class="tb-mat-20"
               matTooltip="{{ 'action.reset' | translate }}"
               matTooltipPosition="above"
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 61bdb48b7c..5a0c401aa6 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -991,7 +991,7 @@
         "type-sms-sent": "SMS sent"
     },
     "debug-settings": {
-        "label": "Debug configuration",
+        "label": "Debug Configuration",
         "on-failure": "Failures only (24/7)",
         "all-messages": "All messages ({{time}})",
         "failures": "Failures",
@@ -999,10 +999,9 @@
         "rule-node": "rule node",
         "calculated-field": "calculated field",
         "hint": {
-            "main": "All node debug messages rate limited with:",
-            "main-limited": "All {{entity}} debug messages will be rate-limited, with a maximum of {{msg}} messages allowed per {{time}}.",
-            "on-failure": "Save all failure debug events without time limit.",
-            "all-messages": "Save all debug events during time limit."
+            "main-limited": "No more than {{msg}} {{entity}} debug messages per {{time}} will be recorded.",
+            "on-failure": "Log all debug messages.",
+            "all-messages": "Log error messages only. "
         }
     },
     "calculated-fields": {