diff --git a/src/util/orm.py b/src/util/orm.py
index 489032c31..e2a5cf41d 100644
--- a/src/util/orm.py
+++ b/src/util/orm.py
@@ -726,8 +726,11 @@ def _add_magic_fields(self):
 
         patches.append(patch.object(BaseModel, "_add_magic_fields", _add_magic_fields))
 
-    if version_gte("saas~16.4"):
-        # 3.5.3 allow loading manual fields
+    # 3.5.3 allow loading manual fields
+    if version_gte("saas~18.4"):
+        patches.append(patch("odoo.fields.is_manual_field_name", lambda name: True))
+        patches.append(patch("odoo.orm.model_classes.is_manual_field_name", lambda name: True))
+    elif version_gte("saas~16.4"):
         patches.append(patch("odoo.addons.base.models.ir_model.IrModelFields._is_manual_name", lambda self, name: True))
 
     with all_patches():