diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TypeRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TypeRepository.java
index 90b22c7fb35..4ed5439ee45 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TypeRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TypeRepository.java
@@ -443,30 +443,30 @@ public class TypeRepository extends EntityRepository<Type> {
       String fieldName = getCustomField(origProperty, "customPropertyConfig");
       if (previous == null || !previous.getVersion().equals(updated.getVersion())) {
         validatePropertyConfigUpdate(entity, origProperty, updatedProperty);
-      }
-      if (recordChange(
-          fieldName,
-          origProperty.getCustomPropertyConfig(),
-          updatedProperty.getCustomPropertyConfig())) {
-        String customPropertyFQN =
-            getCustomPropertyFQN(entity.getName(), updatedProperty.getName());
-        EntityReference propertyType =
-            updatedProperty.getPropertyType(); // Don't store entity reference
-        String customPropertyJson = JsonUtils.pojoToJson(updatedProperty.withPropertyType(null));
-        updatedProperty.withPropertyType(propertyType); // Restore entity reference
-        daoCollection
-            .fieldRelationshipDAO()
-            .upsert(
-                customPropertyFQN,
-                updatedProperty.getPropertyType().getName(),
-                customPropertyFQN,
-                updatedProperty.getPropertyType().getName(),
-                Entity.TYPE,
-                Entity.TYPE,
-                Relationship.HAS.ordinal(),
-                "customProperty",
-                customPropertyJson);
-        postUpdateCustomPropertyConfig(entity, origProperty, updatedProperty);
+        if (recordChange(
+            fieldName,
+            origProperty.getCustomPropertyConfig(),
+            updatedProperty.getCustomPropertyConfig())) {
+          String customPropertyFQN =
+              getCustomPropertyFQN(entity.getName(), updatedProperty.getName());
+          EntityReference propertyType =
+              updatedProperty.getPropertyType(); // Don't store entity reference
+          String customPropertyJson = JsonUtils.pojoToJson(updatedProperty.withPropertyType(null));
+          updatedProperty.withPropertyType(propertyType); // Restore entity reference
+          daoCollection
+              .fieldRelationshipDAO()
+              .upsert(
+                  customPropertyFQN,
+                  updatedProperty.getPropertyType().getName(),
+                  customPropertyFQN,
+                  updatedProperty.getPropertyType().getName(),
+                  Entity.TYPE,
+                  Entity.TYPE,
+                  Relationship.HAS.ordinal(),
+                  "customProperty",
+                  customPropertyJson);
+          postUpdateCustomPropertyConfig(entity, origProperty, updatedProperty);
+        }
       }
     }
 
@@ -505,7 +505,7 @@ public class TypeRepository extends EntityRepository<Type> {
         HashSet<String> addedKeys = new HashSet<>(updatedKeys);
         addedKeys.removeAll(origKeys);
 
-        if (!removedKeys.isEmpty() && addedKeys.isEmpty()) {
+        if (!removedKeys.isEmpty()) {
           List<String> removedEnumKeys = new ArrayList<>(removedKeys);
 
           try {