diff --git a/ui-ngx/src/app/modules/home/pages/rulechain/debug-config-button.component.html b/ui-ngx/src/app/modules/home/pages/rulechain/debug-config-button.component.html
index d5518b71f1..345c38fd38 100644
--- a/ui-ngx/src/app/modules/home/pages/rulechain/debug-config-button.component.html
+++ b/ui-ngx/src/app/modules/home/pages/rulechain/debug-config-button.component.html
@@ -23,7 +23,7 @@
         [disabled]="disabled"
         (click)="openDebugStrategyPanel($event, matButton)">
   <mat-icon [color]="disabled ? 'inherit' : 'primary'">bug_report</mat-icon>
-  <span *ngIf="!debugAll && !debugFailures && !isDebugAllActive()" translate>common.disabled</span>
+  <span *ngIf="!debugFailures && !isDebugAllActive()" translate>common.disabled</span>
   <span *ngIf="isDebugAllActive() && debugFailures" translate>debug-config.all</span>
   <span *ngIf="isDebugAllActive() && !debugFailures">{{ debugAllUntil | debugDurationLeft }}</span>
   <span *ngIf="!isDebugAllActive() && debugFailures" translate>debug-config.failures</span>
diff --git a/ui-ngx/src/app/modules/home/pages/rulechain/rule-node-details.component.html b/ui-ngx/src/app/modules/home/pages/rulechain/rule-node-details.component.html
index 35415dec57..494a8e7dc9 100644
--- a/ui-ngx/src/app/modules/home/pages/rulechain/rule-node-details.component.html
+++ b/ui-ngx/src/app/modules/home/pages/rulechain/rule-node-details.component.html
@@ -46,7 +46,7 @@
               class="tb-rounded-btn flex-1"
               color="primary"
               *ngIf="isSingleton()"
-              [disabled]="disabled"
+              [disabled]="ruleNodeFormGroup.get('singletonMode').disabled || disabled"
               [class.active]="ruleNodeFormGroup.get('singletonMode').value"
               (click)="onSingleModeChange($event)">
         <mat-icon [class.invisible]="!ruleNodeFormGroup.get('singletonMode').value">checkmark</mat-icon>