diff --git a/src/components/FormField/components/NumberInput/index.js b/src/components/FormField/components/NumberInput/index.js
index 7ec9c46..f11e5f4 100644
--- a/src/components/FormField/components/NumberInput/index.js
+++ b/src/components/FormField/components/NumberInput/index.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { classNames } from 'primereact/utils';
 import { Controller } from 'react-hook-form';
-import { is, isEmpty } from 'ramda';
+import { is, isEmpty, isNil } from 'ramda';
 
 import { InputNumber } from 'primereact/inputnumber';
 import { isNaN } from 'mathjs';
@@ -18,7 +18,7 @@ const NumberInput = ({
                          icon = null,
                          locale = 'it-IT',
                          minFractionDigits = 0,
-                         maxFractionDigits = 1,
+                         maxFractionDigits = 0,
                          min,
                          max,
                          disabled = false,
@@ -27,6 +27,7 @@ const NumberInput = ({
                      }) => {
     const minAttr = config.min ? config.min : min;
     const maxAttr = config.max ? config.max : max;
+
     const input = <Controller
         name={fieldName}
         control={control}
@@ -40,9 +41,10 @@ const NumberInput = ({
                          onValueChange={(e) => field.onChange(e.value)}
                          min={minAttr}
                          max={maxAttr}
+                         mode="decimal"
                          locale={locale}
                          showButtons
-                         useGrouping={useGrouping}
+                         useGrouping={!isNil(maxFractionDigits) && parseInt(maxFractionDigits) !== 0}
                          maxFractionDigits={!isNaN(parseInt(maxFractionDigits)) ? parseInt(maxFractionDigits) : 0}
                          minFractionDigits={!isNaN(parseInt(minFractionDigits)) ? parseInt(minFractionDigits) : 0}
                          className={classNames({ 'p-invalid': fieldState.invalid })}/>