From 4df0b38e646286ed1c06b80bdd6e57a123f6edd2 Mon Sep 17 00:00:00 2001
From: ArtemDzhereleiko <adzhereleiko@thingsboard.io>
Date: Fri, 16 Jan 2026 12:18:22 +0200
Subject: [PATCH] UI: Fixed save geofencing cf

---
 ui-ngx/src/app/core/services/calculated-field-form.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui-ngx/src/app/core/services/calculated-field-form.service.ts b/ui-ngx/src/app/core/services/calculated-field-form.service.ts
index 1b9dddfd26..1bedbf99a7 100644
--- a/ui-ngx/src/app/core/services/calculated-field-form.service.ts
+++ b/ui-ngx/src/app/core/services/calculated-field-form.service.ts
@@ -71,7 +71,7 @@ export class CalculatedFieldFormService {
       takeUntilDestroyed(destroyRef)
     ).subscribe(([prevType, nextType]) => {
       const shouldCheck = isEditActive ? isEditActive() : true;
-      if (shouldCheck) {
+      if (shouldCheck && prevType !== nextType) {
         if (![CalculatedFieldType.SIMPLE, CalculatedFieldType.SCRIPT].includes(prevType) ||
           ![CalculatedFieldType.SIMPLE, CalculatedFieldType.SCRIPT].includes(nextType)) {
           form.get('configuration').setValue({} as CalculatedFieldConfiguration, { emitEvent: false });