diff --git a/src/DonationForms/resources/registrars/templates/fields/Amount/CustomAmount.tsx b/src/DonationForms/resources/registrars/templates/fields/Amount/CustomAmount.tsx
index 1341222877..e0cb0b147c 100644
--- a/src/DonationForms/resources/registrars/templates/fields/Amount/CustomAmount.tsx
+++ b/src/DonationForms/resources/registrars/templates/fields/Amount/CustomAmount.tsx
@@ -15,12 +15,17 @@ type CustomAmountProps = {
     onValueChange?: (value: string, name?: string, values?: CurrencyInputOnChangeValues) => void;
 };
 
+const formatter = new Intl.NumberFormat(navigator.language);
+const groupSeparator = formatter.format(1000).replace(/[0-9]/g, '');
+const decimalSeparator = formatter.format(1.1).replace(/[0-9]/g, '');
+
 /**
  * @since 3.0.0
  */
 const CustomAmount = (
     {defaultValue, fieldError, currency, value, onValueChange}: CustomAmountProps
 ) => {
+
     return (
         <div className={classNames('givewp-fields-amount__input-container', {invalid: fieldError})}>
             <CurrencyInput
@@ -28,6 +33,15 @@ const CustomAmount = (
                     locale: navigator.language,
                     currency,
                 }}
+                disableAbbreviations
+                decimalSeparator={decimalSeparator}
+                groupSeparator={
+                    /**
+                     * Replace non-breaking space to avoid conflict with the suffix separator.
+                     * @link https://github.com/cchanxzy/react-currency-input-field/issues/266
+                     */
+                    groupSeparator.replace(/\u00A0/g, ' ')
+                }
                 className="givewp-fields-amount__input givewp-fields-amount__input-custom"
                 aria-invalid={fieldError ? 'true' : 'false'}
                 id="amount-custom"
@@ -36,7 +50,7 @@ const CustomAmount = (
                 defaultValue={defaultValue}
                 value={value}
                 decimalsLimit={2}
-                onValueChange={(value) => onValueChange(value !== undefined ? value : '')}
+                onValueChange={(value) => {onValueChange(value !== undefined ? value : '')}}
             />
         </div>
     );