diff --git a/package-lock.json b/package-lock.json
index b31a0a8a2..acecc0c3f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6162,9 +6162,9 @@
       "dev": true
     },
     "codemirror": {
-      "version": "5.53.2",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.53.2.tgz",
-      "integrity": "sha512-wvSQKS4E+P8Fxn/AQ+tQtJnF1qH5UOlxtugFLpubEZ5jcdH2iXTVinb+Xc/4QjshuOxRm4fUsU2QPF1JJKiyXA=="
+      "version": "5.58.3",
+      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.58.3.tgz",
+      "integrity": "sha512-KBhB+juiyOOgn0AqtRmWyAT3yoElkuvWTI6hsHa9E6GQrl6bk/fdAYcvuqW1/upO9T9rtEtapWdw4XYcNiVDEA=="
     },
     "codemirror-formatting": {
       "version": "1.0.0",
@@ -9744,9 +9744,9 @@
       "dev": true
     },
     "highlight.js": {
-      "version": "9.18.1",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.1.tgz",
-      "integrity": "sha512-OrVKYz70LHsnCgmbXctv/bfuvntIKDz177h0Co37DQ5jamGZLVmoCVMtjMtNZY3X9DrCcKfklHPNeA0uPZhSJg==",
+      "version": "9.18.5",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.5.tgz",
+      "integrity": "sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA==",
       "dev": true
     },
     "hmac-drbg": {
diff --git a/src/domain_abstract/ui/InputNumber.js b/src/domain_abstract/ui/InputNumber.js
index e3f18921e..4a2c13a5e 100644
--- a/src/domain_abstract/ui/InputNumber.js
+++ b/src/domain_abstract/ui/InputNumber.js
@@ -235,6 +235,8 @@ export default Input.extend({
     var unit = model.get('unit') || (units.length && units[0]) || '';
     var max = model.get('max');
     var min = model.get('min');
+    var limitlessMax = !!model.get('limitlessMax');
+    var limitlessMin = !!model.get('limitlessMin');
 
     if (opt.deepCheck) {
       var fixed = model.get('fixedValues') || [];
@@ -258,8 +260,10 @@ export default Input.extend({
       }
     }
 
-    if (!isUndefined(max) && max !== '') val = val > max ? max : val;
-    if (!isUndefined(min) && min !== '') val = val < min ? min : val;
+    if (!limitlessMax && !isUndefined(max) && max !== '')
+      val = val > max ? max : val;
+    if (!limitlessMax && !isUndefined(min) && min !== '')
+      val = val < min ? min : val;
 
     return {
       force,