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 5449bce5a7..f98d24bd52 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
@@ -47,14 +47,23 @@ import { CalculatedFieldsService } from '@core/http/calculated-fields.service';
 })
 export class CalculatedFieldsTableComponent implements OnInit {
 
-  @Input() entityId: EntityId;
+  @Input()
+  set entityId(entityId: EntityId) {
+    if (this.entityIdValue !== entityId) {
+      this.entityIdValue = entityId;
+      this.entitiesTable.resetSortAndFilter(this.activeValue);
+      if (!this.activeValue) {
+        this.hasInitialized = true;
+      }
+    }
+  }
 
   @Input()
   set active(active: boolean) {
     if (this.activeValue !== active) {
       this.activeValue = active;
-      if (this.activeValue && this.dirtyValue) {
-        this.dirtyValue = false;
+      if (this.activeValue && this.hasInitialized) {
+        this.hasInitialized = false;
         this.entitiesTable.updateData();
       }
     }
@@ -65,7 +74,8 @@ export class CalculatedFieldsTableComponent implements OnInit {
   calculatedFieldsTableConfig: CalculatedFieldsTableConfig;
 
   private activeValue = false;
-  private dirtyValue = false;
+  private hasInitialized = false;
+  private entityIdValue: EntityId;
 
   constructor(private calculatedFieldsService: CalculatedFieldsService,
               private entityService: EntityService,
@@ -83,7 +93,7 @@ export class CalculatedFieldsTableComponent implements OnInit {
   }
 
   ngOnInit() {
-    this.dirtyValue = !this.activeValue;
+    this.hasInitialized = !this.activeValue;
 
     this.calculatedFieldsTableConfig = new CalculatedFieldsTableConfig(
       this.calculatedFieldsService,
@@ -91,7 +101,7 @@ export class CalculatedFieldsTableComponent implements OnInit {
       this.dialogService,
       this.translate,
       this.dialog,
-      this.entityId,
+      this.entityIdValue,
       this.store,
       this.viewContainerRef,
       this.overlay,
diff --git a/ui-ngx/src/app/shared/models/calculated-field.models.ts b/ui-ngx/src/app/shared/models/calculated-field.models.ts
index 714303e286..253bc58f39 100644
--- a/ui-ngx/src/app/shared/models/calculated-field.models.ts
+++ b/ui-ngx/src/app/shared/models/calculated-field.models.ts
@@ -17,13 +17,10 @@ import { EntityDebugSettings, HasTenantId, HasVersion } from '@shared/models/ent
 import { BaseData } from '@shared/models/base-data';
 import { CalculatedFieldId } from '@shared/models/id/calculated-field-id';
 
-export interface CalculatedField extends BaseData<CalculatedFieldId>, HasVersion, HasTenantId {
-  entityId: string;
+export interface CalculatedField extends Omit<BaseData<CalculatedFieldId>, 'label'>, HasVersion, HasTenantId {
   type: CalculatedFieldType;
-  name: string;
   debugSettings?: EntityDebugSettings;
   externalId?: string;
-  createdTime?: number;
   configuration: CalculatedFieldConfiguration;
 }