diff --git a/ui-admin/src/js/components/common/form/FormUtil.js b/ui-admin/src/js/components/common/form/FormUtil.js
index bfe7a21a205ff314127a1089e67204227bd7de2a..f14eb1c91cf7bec16e8359aa123e8f2ac313d095 100644
--- a/ui-admin/src/js/components/common/form/FormUtil.js
+++ b/ui-admin/src/js/components/common/form/FormUtil.js
@@ -45,10 +45,27 @@ class FormUtil {
     }
   }
 
+  getFieldValue(object, path) {
+    const field = !_.isNil(object) ? _.get(object, path, null) : null
+
+    if (!_.isNil(field)) {
+      const value = field.value
+      if (_.isNil(value)) {
+        return null
+      } else if (_.isString(value) && _.isEmpty(value.trim())) {
+        return null
+      } else {
+        return value
+      }
+    } else {
+      return null
+    }
+  }
+
   hasFieldChanged(currentObject, originalObject, path) {
-    const currentValue = _.get(currentObject, path)
-    const originalValue = originalObject ? _.get(originalObject, path) : null
-    return originalValue.value !== currentValue.value
+    const currentValue = this.getFieldValue(currentObject, path)
+    const originalValue = this.getFieldValue(originalObject, path)
+    return originalValue !== currentValue
   }
 
   haveFieldsChanged(currentObject, originalObject, paths) {