diff --git a/datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php b/datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php
index 99a0f5b35..5259ceacb 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php
@@ -1107,15 +1107,17 @@ class ObjectFormManager extends FormManager
         // First we need to update the Object with its new values in order to enable the dependents fields to update
         $sObjectClass = get_class($this->oObject);
         foreach ($aCurrentValues as $sAttCode => $value) {
-            if (!array_key_exists($sAttCode, $this->aFieldsAtts)) {
-                continue;
-            }
-            $iAttributeFlags = $this->aFieldsAtts[$sAttCode];
-            if ($iAttributeFlags & OPT_ATT_HIDDEN) {
-                continue;
-            }
-            if ($iAttributeFlags & OPT_ATT_READONLY) {
-                continue;
+            if (count($this->aFieldsAtts) !== 0) {
+                if (!array_key_exists($sAttCode, $this->aFieldsAtts)) {
+                    continue;
+                }
+                $iAttributeFlags = $this->aFieldsAtts[$sAttCode];
+                if ($iAttributeFlags & OPT_ATT_HIDDEN) {
+                    continue;
+                }
+                if ($iAttributeFlags & OPT_ATT_READONLY) {
+                    continue;
+                }
             }
 
             if (MetaModel::IsValidAttCode($sObjectClass, $sAttCode)) {