2 files changed, 10 insertions, 22 deletions
diff --git a/addons/web/static/src/js/fields/field_registry.js b/addons/web/static/src/js/fields/field_registry.js
index 925b405051e..ef174702579 100644
--- a/addons/web/static/src/js/fields/field_registry.js
+++ b/addons/web/static/src/js/fields/field_registry.js
@@ -1,18 +1,12 @@
 odoo.define('web.field_registry', function (require) {
-"use strict";
-
-var Registry = require('web.Registry');
+    "use strict";
 
-var FieldRegistry = Registry.extend({
-    add: function (key, value, score) {
-        if (value.prototype instanceof owl.Component) {
-            throw new Error("This registry should not contain any Component. Use 'web.field_registry_owl' instead.");
-        }
-        return this._super(...arguments);
-    },
-});
+    const Registry = require('web.Registry');
 
-return new FieldRegistry();
+    return new Registry(
+        null,
+        (value) => !(value.prototype instanceof owl.Component)
+    );
 });
 
 odoo.define('web._field_registry', function (require) {
diff --git a/addons/web/static/src/js/fields/field_registry_owl.js b/addons/web/static/src/js/fields/field_registry_owl.js
index 907ea38a9d7..635db621829 100644
--- a/addons/web/static/src/js/fields/field_registry_owl.js
+++ b/addons/web/static/src/js/fields/field_registry_owl.js
@@ -3,16 +3,10 @@ odoo.define('web.field_registry_owl', function (require) {
 
     const Registry = require('web.Registry');
 
-    const FieldRegistry = Registry.extend({
-        add: function (key, value, score) {
-            if (!(value.prototype instanceof owl.Component)) {
-                throw new Error("This registry should only contain subclasses of Component");
-            }
-            return this._super(...arguments);
-        },
-    });
-
-    return new FieldRegistry();
+    return new Registry(
+        null,
+        (value) => value.prototype instanceof owl.Component
+    );
 });
 
 odoo.define('web._field_registry_owl', function (require) {