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 5e7d532623..2c0418bd4f 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
@@ -39,7 +39,6 @@ import { catchError, filter, switchMap, tap } from 'rxjs/operators';
 import {
   ArgumentType,
   CalculatedField,
-  CalculatedFieldDebugDialogData,
   CalculatedFieldEventArguments,
   CalculatedFieldType,
   CalculatedFieldTypeTranslations,
@@ -47,7 +46,7 @@ import {
   getCalculatedFieldArgumentsHighlights,
 } from '@shared/models/calculated-field.models';
 import {
-  CalculatedFieldDebugDialogComponent,
+  CalculatedFieldDebugDialogComponent, CalculatedFieldDebugDialogData,
   CalculatedFieldDialogComponent,
   CalculatedFieldDialogData,
   CalculatedFieldScriptTestDialogComponent,
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/debug-dialog/calculated-field-debug-dialog.component.ts b/ui-ngx/src/app/modules/home/components/calculated-fields/components/debug-dialog/calculated-field-debug-dialog.component.ts
index 8618a11990..2b987e124a 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/debug-dialog/calculated-field-debug-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/debug-dialog/calculated-field-debug-dialog.component.ts
@@ -22,7 +22,17 @@ import { Router } from '@angular/router';
 import { DialogComponent } from '@shared/components/dialog.component';
 import { CalculatedFieldEventBody, DebugEventType, EventType } from '@shared/models/event.models';
 import { EventTableComponent } from '@home/components/event/event-table.component';
-import { CalculatedFieldDebugDialogData, CalculatedFieldType } from '@shared/models/calculated-field.models';
+import {
+  CalculatedField,
+  CalculatedFieldTestScriptFn,
+  CalculatedFieldType
+} from '@shared/models/calculated-field.models';
+
+export interface CalculatedFieldDebugDialogData {
+  tenantId: string;
+  value: CalculatedField;
+  getTestScriptDialogFn: CalculatedFieldTestScriptFn;
+}
 
 @Component({
   selector: 'tb-calculated-field-debug-dialog',
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 c124e39a32..9dface6a67 100644
--- a/ui-ngx/src/app/shared/models/calculated-field.models.ts
+++ b/ui-ngx/src/app/shared/models/calculated-field.models.ts
@@ -148,12 +148,6 @@ export interface CalculatedFieldArgumentValue extends CalculatedFieldArgument {
 
 export type CalculatedFieldTestScriptFn = (calculatedField: CalculatedField, argumentsObj?: Record<string, unknown>, closeAllOnSave?: boolean) => Observable<string>;
 
-export interface CalculatedFieldDebugDialogData {
-  tenantId: string;
-  value: CalculatedField;
-  getTestScriptDialogFn: CalculatedFieldTestScriptFn;
-}
-
 export interface CalculatedFieldTestScriptInputParams {
   arguments: CalculatedFieldEventArguments;
   expression: string;