diff --git a/package-lock.json b/package-lock.json
index 01722537851..1aaa6eb9853 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,7 @@
         "@binary-com/binary-document-uploader": "^2.4.4",
         "@binary-com/binary-style": "^0.2.26",
         "@binary-com/webtrader-charts": "^0.6.1",
-        "@deriv-com/quill-ui": "^1.13.32",
+        "@deriv-com/quill-ui": "^1.13.37",
         "@deriv/deriv-api": "^1.0.15",
         "@deriv/quill-icons": "^1.23.1",
         "@livechat/customer-sdk": "4.0.2",
@@ -2502,9 +2502,9 @@
       }
     },
     "node_modules/@deriv-com/quill-ui": {
-      "version": "1.13.32",
-      "resolved": "https://registry.npmjs.org/@deriv-com/quill-ui/-/quill-ui-1.13.32.tgz",
-      "integrity": "sha512-iq8Y9pjjqMJjPbPEi5ZwG2zCRG21dQDrZ5uvJik7QZoXO2bXCu/7Fu6soh8ZNSIo46LsKRuA5EqFsM/+qPyubg==",
+      "version": "1.13.37",
+      "resolved": "https://registry.npmjs.org/@deriv-com/quill-ui/-/quill-ui-1.13.37.tgz",
+      "integrity": "sha512-lgy+RwwKDPPktTYlHy67ReK0k743o2ei7pCe68M7CvheYJjpqIgwsdqFJ+N3TC/HxPg5k+XqWpeUEWAOR6dJTA==",
       "dependencies": {
         "@deriv-com/quill-tokens": "^2.0.8",
         "@deriv/quill-icons": "^1.22.10",
diff --git a/package.json b/package.json
index e20f4fccc0a..f18dff4f30c 100644
--- a/package.json
+++ b/package.json
@@ -105,7 +105,7 @@
     "@binary-com/binary-document-uploader": "^2.4.4",
     "@binary-com/binary-style": "^0.2.26",
     "@binary-com/webtrader-charts": "^0.6.1",
-    "@deriv-com/quill-ui": "^1.13.32",
+    "@deriv-com/quill-ui": "^1.13.37",
     "@deriv/deriv-api": "^1.0.15",
     "@deriv/quill-icons": "^1.23.1",
     "@livechat/customer-sdk": "4.0.2",
diff --git a/src/javascript/app/pages/form/barrier-fields.jsx b/src/javascript/app/pages/form/barrier-fields.jsx
index f58b34268fc..864f95cf101 100644
--- a/src/javascript/app/pages/form/barrier-fields.jsx
+++ b/src/javascript/app/pages/form/barrier-fields.jsx
@@ -52,8 +52,6 @@ const BarrierFields = ({ formName, handleAmountChange }) => {
         barrier_error,
     } = barrierData;
 
-    const barrierRegex = '[+-]?(d+(.d*)?|.d+)';
-
     const getMessage = (indicative, type) => {
         const tooltipContent = localize('This is an indicative barrier. Actual barrier will be the entry spot plus the barrier offset.');
         let description;
@@ -84,12 +82,12 @@ const BarrierFields = ({ formName, handleAmountChange }) => {
                             onChange={(e) =>
                                 handleAmountChange(
                                     e,
-                                    'barrier',
-                                    barrier_data?.isOffset ? barrierRegex : null
+                                    'barrier'
                                 )
                             }
                             status={barrier_error ? 'error' : 'neutral'}
                             message={getMessage(barrier_indicator)}
+                            customType='barrier'
                         />
                     </div>
                 </div>
@@ -108,10 +106,11 @@ const BarrierFields = ({ formName, handleAmountChange }) => {
                                 allowDecimals
                                 rightIcon={barrier_data?.isOffsetHightLow && barrierIcon}
                                 onChange={(e) => handleAmountChange(
-                                    e, 'barrier_high', barrier_data?.isOffsetHightLow ? barrierRegex : null
+                                    e, 'barrier_high'
                                 )}
                                 status={barrier_error ? 'error' : 'neutral'}
                                 message={getMessage(barrier_indicator_high, 'high')}
+                                customType='barrier'
                             />
                         </div>
                     </div>
@@ -124,9 +123,10 @@ const BarrierFields = ({ formName, handleAmountChange }) => {
                                 allowDecimals
                                 rightIcon={barrier_data?.isOffsetHightLow && barrierIcon}
                                 onChange={(e) => handleAmountChange(
-                                    e, 'barrier_low', barrier_data?.isOffsetHightLow ? barrierRegex : null
+                                    e, 'barrier_low'
                                 )}
                                 message={getMessage(barrier_indicator_low)}
+                                customType='barrier'
                             />
                         </div>
                     </div>
diff --git a/src/javascript/app/pages/portal.jsx b/src/javascript/app/pages/portal.jsx
index f499b93ac7a..c3268c00c87 100644
--- a/src/javascript/app/pages/portal.jsx
+++ b/src/javascript/app/pages/portal.jsx
@@ -6,7 +6,7 @@ const Portal = ({ children }) => {
 
     useEffect(() => {
         const el = elRef.current;
-        document.body.appendChild(el);
+        document.body?.appendChild(el);
 
         return () => {
             if (document.body.contains(el)) {