diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts b/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts
index fcef11799d..58caa759da 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts
@@ -97,7 +97,7 @@ export class CalculatedFieldsTableConfig extends EntityTableConfig<CalculatedFie
         name: this.translate.instant('action.edit'),
         icon: 'edit',
         isEnabled: () => true,
-        onAction: (_, entity) => this.editCalculatedField(entity)
+        onAction: (_, entity) => this.editCalculatedField(entity),
       }
     );
   }
@@ -171,7 +171,7 @@ export class CalculatedFieldsTableConfig extends EntityTableConfig<CalculatedFie
         tenantId: this.tenantId,
       }
     })
-      .afterClosed()
+      .afterClosed();
   }
 
   private getDebugConfigLabel(debugSettings: EntityDebugSettings): string {
@@ -180,7 +180,7 @@ export class CalculatedFieldsTableConfig extends EntityTableConfig<CalculatedFie
     if (!isDebugActive) {
       return debugSettings?.failuresEnabled ? this.translate.instant('debug-settings.failures') : this.translate.instant('common.disabled');
     } else {
-      return this.durationLeft.transform(debugSettings?.allEnabledUntil)
+      return this.durationLeft.transform(debugSettings?.allEnabledUntil);
     }
   }
 
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table.component.html b/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table.component.html
index d627e16ce9..8b0b663eb4 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table.component.html
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table.component.html
@@ -15,4 +15,6 @@
     limitations under the License.
 
 -->
-<tb-entities-table [entitiesTableConfig]="calculatedFieldsTableConfig"></tb-entities-table>
+@if (calculatedFieldsTableConfig) {
+  <tb-entities-table [entitiesTableConfig]="calculatedFieldsTableConfig"></tb-entities-table>
+}
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table.component.ts b/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table.component.ts
index 4c22ad2896..4fda1cc075 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table.component.ts
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table.component.ts
@@ -16,6 +16,7 @@
 
 import {
   ChangeDetectionStrategy,
+  ChangeDetectorRef,
   Component,
   DestroyRef,
   effect,
@@ -43,7 +44,7 @@ export class CalculatedFieldsTableComponent {
 
   @ViewChild(EntitiesTableComponent, {static: true}) entitiesTable: EntitiesTableComponent;
 
-  active = input();
+  active = input<boolean>();
   entityId = input<EntityId>();
 
   calculatedFieldsTableConfig: CalculatedFieldsTableConfig;
@@ -54,6 +55,7 @@ export class CalculatedFieldsTableComponent {
               private store: Store<AppState>,
               private durationLeft: DurationLeftPipe,
               private popoverService: TbPopoverService,
+              private cd: ChangeDetectorRef,
               private destroyRef: DestroyRef) {
 
     effect(() => {
@@ -68,6 +70,7 @@ export class CalculatedFieldsTableComponent {
           this.popoverService,
           this.destroyRef,
         );
+        this.cd.markForCheck();
       }
     });
   }